#2457 hub: more verbose assertPerm error
Merged 4 years ago by tkopecek. Opened 4 years ago by tkopecek.
tkopecek/koji issue2429  into  master

file modified
+6 -1
@@ -501,7 +501,12 @@ 

  

      def assertPerm(self, name):

          if not self.hasPerm(name) and not self.hasPerm('admin'):

-             raise koji.ActionNotAllowed("%s permission required" % name)

+             msg = "%s permission required" % name

+             if self.logged_in:

+                 msg += ' (logged in as %s)' % self.user_data['name']

+             else:

+                 msg += ' (user not logged in)'

+             raise koji.ActionNotAllowed(msg)

  

      def assertLogin(self):

          if not self.logged_in:

Metadata Update from @tkopecek:
- Pull-request tagged with: testing-ready

4 years ago

Metadata Update from @jcupova:
- Pull-request tagged with: testing-done

4 years ago

@mikem maybe use VerbosePolicy settings also for this?

@mikem maybe use VerbosePolicy settings also for this?

This isn't policy code, so I don't think that setting should apply

            msg = "%s permission required" % name
            if self.logged_in:
                msg += ' (logged as %s)' % self.user_data['name']
            else:
                msg += ' (user not logged in)'
            raise koji.ActionNotAllowed(msg)

"logged as" => "logged in as"

otherwise, looks good to me!

rebased onto b4cfca0

4 years ago

Commit 9c92f5e fixes this pull-request

Pull-Request has been merged by tkopecek

4 years ago