#2995 fix "an user" -> "a user" grammar in help text and errors
Merged 9 months ago by tkopecek. Opened 9 months ago by ktdreyer.
ktdreyer/koji a-user  into  master

file modified
+1 -1
@@ -7978,7 +7978,7 @@ 

  

  

  def anon_handle_userinfo(goptions, session, args):

-     """[admin] Show information about an user"""

+     """[admin] Show information about a user"""

      usage = _("usage: %prog userinfo [options] <username> [<username> ...]")

      parser = OptionParser(usage=get_usage_str(usage))

      (options, args) = parser.parse_args(args)

file modified
+1 -1
@@ -8706,7 +8706,7 @@ 

      if not ginfo or ginfo['usertype'] != koji.USERTYPES['GROUP']:

          raise koji.GenericError("Not a group: %s" % group)

      if not uinfo:

-         raise koji.GenericError("Not an user: %s" % user)

+         raise koji.GenericError("Not a user: %s" % user)

      if uinfo['usertype'] == koji.USERTYPES['GROUP']:

          raise koji.GenericError("Groups cannot be members of other groups")

      # check to see if user is already a member

@@ -67,7 +67,7 @@ 

          unblock-group-req         Unblock a group's requirement listing

          unblock-pkg               Unblock a package in the listing for tag

          unlock-tag                Unlock a tag

-         userinfo                  Show information about an user

+         userinfo                  Show information about a user

          write-signed-rpm          Write signed RPMs to disk

  

  Try "{progname} --help" for help about global options

@@ -67,7 +67,7 @@ 

          unblock-group-req         Unblock a group's requirement listing

          unblock-pkg               Unblock a package in the listing for tag

          unlock-tag                Unlock a tag

-         userinfo                  Show information about an user

+         userinfo                  Show information about a user

          write-signed-rpm          Write signed RPMs to disk

  

  bind commands:

@@ -25,7 +25,7 @@ 

          self.get_user.side_effect = data

          with self.assertRaises(koji.GenericError) as cm:

              self.exports.addGroupMember(group, username)

-         self.assertEqual("Not an user: %s" % username, str(cm.exception))

+         self.assertEqual("Not a user: %s" % username, str(cm.exception))

  

      def test_non_exist_group(self):

          data = [None,