From 4c16177ada2bfd13cad07cde0139c8f980d8746f Mon Sep 17 00:00:00 2001

From: Stefan Knorr <sknorr@suse.de>

Date: Fri, 24 May 2019 13:42:47 +0200

Subject: [PATCH 7/9] Random drive-by typo fixes for osc command-line messages

---

 osc/commandline.py | 40 ++++++++++++++++++++--------------------

 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/osc/commandline.py b/osc/commandline.py

index 888be1d..0de204b 100644

--- a/osc/commandline.py

+++ b/osc/commandline.py

@@ -462,8 +462,8 @@ class Osc(cmdln.Cmdln):

     def do_addcontainers(self, subcmd, opts, *args):

         """${cmd_name}: Add maintained containers for a give package

-        The command adds all containers which are marked as maitained and contain

-        an rpm out of the specified source package.

+        The command adds all containers which are marked as maintained and contain

+        an rpm originating from the specified source package.

         Examples:

             osc addcontainers [PROJECT PACKAGE]

@@ -1143,7 +1143,7 @@ class Osc(cmdln.Cmdln):

         [See http://en.opensuse.org/openSUSE:Build_Service_Collaboration for information

         on this topic.]

-        See the "request" command for showing and modifing existing requests.

+        See the "request" command for showing and modifying existing requests.

         usage:

             osc submitreq [OPTIONS]

@@ -1664,7 +1664,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.

                 (project, package, user, role)

         if get_user_meta(apiurl, user) == None:

-            raise oscerr.WrongArgs('osc: an error occured.')

+            raise oscerr.WrongArgs('osc: an error occurred.')

         return actionxml

@@ -1735,7 +1735,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.

             actionxml = """ <action type="set_bugowner"> <target project="%s" %s /> <group name="%s" /> </action> """ % \

                     (project, package, group)

             if get_group_meta(apiurl, group) == None:

-                raise oscerr.WrongArgs('osc: an error occured.')

+                raise oscerr.WrongArgs('osc: an error occurred.')

         else:

             actionxml = """ <action type="set_bugowner"> <target project="%s" %s /> <person name="%s" /> </action> """ % \

                     (project, package, user)

@@ -2023,7 +2023,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.

         [See http://en.opensuse.org/openSUSE:Build_Service_Collaboration

         for information on this topic.]

-        See the "request" command for showing and modifing existing requests.

+        See the "request" command for showing and modifying existing requests.

         osc changedevelrequest PROJECT PACKAGE DEVEL_PROJECT [DEVEL_PACKAGE]

         """

@@ -2098,7 +2098,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.

     @cmdln.option('-i', '--interactive', action='store_true',

                         help='interactive review of request')

     @cmdln.option('--or-revoke', action='store_true',

-                        help='For automatisation scripts: accepts (if using with accept argument) a request when it is in new or review state. Or revoke it when it got declined. Otherwise just do nothing.')

+                        help='For automation scripts: accepts (if using with accept argument) a request when it is in new or review state. Or revoke it when it got declined. Otherwise just do nothing.')

     @cmdln.option('--non-interactive', action='store_true',

                         help='non-interactive review of request')

     @cmdln.option('--exclude-target-project', action='append',

@@ -2624,7 +2624,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.

                                         change_request_state(apiurl, req.reqid, 'superseded',

                                                              'superseded by %s' % rid, rid)

-    # editmeta and its aliases are all depracated

+    # editmeta and its aliases are all deprecated

     @cmdln.alias("editprj")

     @cmdln.alias("createprj")

     @cmdln.alias("editpac")

@@ -3069,7 +3069,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.

         [See http://openbuildservice.org/help/manuals/obs-reference-guide/cha.obs.maintenance_setup.html

          for information on this topic.]

-        This command is used by the maintence team to start the release process of a maintenance update.

+        This command is used by the maintenance team to start the release process of a maintenance update.

         This includes usually testing based on the defined reviewers of the update project.

         usage:

@@ -3115,7 +3115,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.

         [See http://openbuildservice.org/help/manuals/obs-reference-guide/cha.obs.maintenance_setup.html

         for information on this topic.]

-        This command is asking to open an empty maintence incident. This can usually only be done by a responsible

+        This command is asking to open an empty maintenance incident. This can usually only be done by a responsible

         maintenance team.

         Please see the "mbranch" command on how to full such a project content and

         the "patchinfo" command how add the required maintenance update information.

@@ -3187,7 +3187,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.

         [See http://openbuildservice.org/help/manuals/obs-reference-guide/cha.obs.maintenance_setup.html

         for information on this topic.]

-        This command is asking the maintence team to start a maintence incident based on a

+        This command is asking the maintenance team to start a maintenance incident based on a

         created maintenance update. Please see the "mbranch" command on how to create such a project and

         the "patchinfo" command how add the required maintenance update information.

@@ -3833,9 +3833,9 @@ Please submit there instead, or use --nodevelproject to force direct submission.

             baserev = linkinfo.get('baserev')

             opts.revision = baserev

             if pacs:

-                print("diff working copy against last commited version\n")

+                print("diff working copy against last committed version\n")

             else:

-                print("diff commited package against linked revision %s\n" % baserev)

+                print("diff committed package against linked revision %s\n" % baserev)

                 run_pager(server_diff(self.get_api_url(), linkinfo.get('project'), linkinfo.get('package'), baserev,

                   args[0], args[1], linkinfo.get('lsrcmd5'), not opts.plain, opts.missingok))

                 return

@@ -4189,7 +4189,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.

     def do_prdiff(self, subcmd, opts, *args):

         """${cmd_name}: Server-side diff of two projects

-        Compares two projects and either summarises or outputs the

+        Compares two projects and either summarizes or outputs the

         differences in full.  In the second form, a project is compared

         with one of its branches inside a home:$USER project (the branch

         is treated as NEWPRJ).  The home branch is optional if the current

@@ -5605,7 +5605,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.

         Trigger reasons might be:

           - new build (never build yet or rebuild manually forced)

-          - source change (eg. on updating sources)

+          - source change (e.g. on updating sources)

           - meta change (packages which are used for building have changed)

           - rebuild count sync (In case that it is configured to sync release numbers)

@@ -5756,7 +5756,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.

         The arguments REPOSITORY and ARCH are optional. They can be taken from

         the first two columns of the 'osc repos' output. If not specified,

-        REPOSITORY defaults to the 'build_repositoy' config entry in your 'oscrc'

+        REPOSITORY defaults to the 'build_repository' config entry in your 'oscrc'

         and ARCH defaults to your host architecture.

         usage:

@@ -6244,7 +6244,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.

         of the 'osc repos' output. BUILD_DESCR is either a RPM spec file, or a

         Debian dsc file.

-        The command honours packagecachedir, build-root and build-uid

+        The command honors packagecachedir, build-root and build-uid

         settings in oscrc, if present. You may want to set su-wrapper = 'sudo'

         in oscrc, and configure sudo with option NOPASSWD for /usr/bin/build.

@@ -7190,7 +7190,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.

         usage:

            osc getbinaries REPOSITORY                                 # works in checked out project/package (check out all archs in subdirs)

            osc getbinaries REPOSITORY ARCHITECTURE                    # works in checked out project/package

-           osc getbinaries PROJECT REPOSITORY ARCHITECTRUE

+           osc getbinaries PROJECT REPOSITORY ARCHITECTURE

            osc getbinaries PROJECT PACKAGE REPOSITORY ARCHITECTURE

            osc getbinaries PROJECT PACKAGE REPOSITORY ARCHITECTURE FILE

         ${cmd_option_list}

@@ -8744,10 +8744,10 @@ Please submit there instead, or use --nodevelproject to force direct submission.

         to sign the public key with your own existing key.

         If a project has no key, the key from upper level project will

-        be used (eg. when dropping "KDE:KDE4:Community" key, the one from

+        be used (e.g. when dropping "KDE:KDE4:Community" key, the one from

         "KDE:KDE4" will be used).

-        WARNING: THE OLD KEY WILL NOT BE RESTORABLE WHEN USING DELETE OR CREATE

+        WARNING: THE OLD KEY CANNOT BE RESTORED AFTER USING DELETE OR CREATE

         ${cmd_usage}

         ${cmd_option_list}

-- 

2.21.0