From 10bc242c327ad92e78d5a1a07b121f4310192c41 Mon Sep 17 00:00:00 2001
From: Ville Skyttä <ville.skytta@iki.fi>
Date: Jul 30 2017 09:49:19 +0000
Subject: Spelling fixes


---

diff --git a/builder/kojid b/builder/kojid
index f34bff6..7ca0338 100755
--- a/builder/kojid
+++ b/builder/kojid
@@ -1219,7 +1219,7 @@ class BuildArchTask(BaseBuildTask):
             if len(srpm_files) == 0:
                 raise koji.BuildError("no srpm files found for task %i" % self.id)
             if len(srpm_files) > 1:
-                raise koji.BuildError("mulitple srpm files found for task %i: %s" % (self.id, srpm_files))
+                raise koji.BuildError("multiple srpm files found for task %i: %s" % (self.id, srpm_files))
 
             # Run sanity checks.  Any failures will throw a BuildError
             self.srpm_sanity_checks("%s/%s" % (resultdir,srpm_files[0]))
@@ -3681,7 +3681,7 @@ class BaseImageTask(OzImageTask):
 
         @args:
             img_opts - an existing dict with any pre-existing parameters
-            fixed_params - list of parameters that must not be overriden
+            fixed_params - list of parameters that must not be overridden
         @returns:
             nothing - dict is modified in place
         """
@@ -3873,8 +3873,8 @@ class BaseImageTask(OzImageTask):
                 uses this to figure out what plugin to run
             img_opts - a dict of additional options that specific to the target
                 type we pass in via image_type
-            fixed_params - a list of parameter keys that should not be overriden
-                           by the --factory-parameter CLI
+            fixed_params - a list of parameter keys that should not be
+                           overridden by the --factory-parameter CLI
         @returns:
             A Builder() object from ImageFactory that contains information
             about the image building include state and progress.
@@ -3917,7 +3917,7 @@ class BaseImageTask(OzImageTask):
         if format == 'qcow2':
             # qemu-img changed its default behavior at some point to generate a
             # v3 image when the requested output format is qcow2.  We don't
-            # want koji to output different formats based on the verison of
+            # want koji to output different formats based on the version of
             # qemu-img that happens to be on the builder. Here we use a function
             # inside of Image Factory that detects qemu-img behavior and adds
             # the correct options to ensure original "v2" compatibility
diff --git a/builder/mergerepos b/builder/mergerepos
index cb081bb..714856b 100755
--- a/builder/mergerepos
+++ b/builder/mergerepos
@@ -209,7 +209,7 @@ class RepoMerge(object):
                     other_srpm, other_repoid = include_srpms[srpm_name]
                     if pkg.repoid != other_repoid:
                         # We found a rpm built from an srpm with the same name in a previous repo.
-                        # The previous repo takes precendence, so ignore the srpm found here.
+                        # The previous repo takes precedence, so ignore the srpm found here.
                         sys.stderr.write('Package %s already provided by repo %s'
                                 ' (at %s in repo %s)\n'
                                 % (srpm_name, other_repoid, str(pkg), pkg.repoid))
diff --git a/cli/koji b/cli/koji
index ab0fb66..4757b51 100755
--- a/cli/koji
+++ b/cli/koji
@@ -67,7 +67,7 @@ def register_plugin(plugin):
 
 def load_plugins(options, path):
     """Load plugins specified by our configuration plus system plugins. Order
-    is that system plugins are first, so they can be overriden by
+    is that system plugins are first, so they can be overridden by
     user-specified ones with same name."""
     logger = logging.getLogger('koji.plugins')
     if os.path.exists(path):
diff --git a/cli/koji_cli/commands.py b/cli/koji_cli/commands.py
index 77256ba..0e85b05 100644
--- a/cli/koji_cli/commands.py
+++ b/cli/koji_cli/commands.py
@@ -4921,7 +4921,7 @@ def handle_remove_tag_inheritance(goptions, session, args):
         if not priority:
             print(_("Please specify a priority on the command line."))
             return
-        print(_("Error: Key constrainsts may be broken.  Exiting."))
+        print(_("Error: Key constraints may be broken.  Exiting."))
         return
 
     # len(data) == 1
diff --git a/cli/koji_cli/lib.py b/cli/koji_cli/lib.py
index 7bd61f8..6b3e8a6 100644
--- a/cli/koji_cli/lib.py
+++ b/cli/koji_cli/lib.py
@@ -169,7 +169,7 @@ class TaskWatcher(object):
         return self.str()
 
     def get_failure(self):
-        """Print infomation about task completion"""
+        """Print information about task completion"""
         if self.info['state'] != koji.TASK_STATES['FAILED']:
             return ''
         error = None
diff --git a/docs/source/external_repo_server_bootstrap.rst b/docs/source/external_repo_server_bootstrap.rst
index 192323a..b755e5b 100644
--- a/docs/source/external_repo_server_bootstrap.rst
+++ b/docs/source/external_repo_server_bootstrap.rst
@@ -124,7 +124,7 @@ Tags
     dist-f10-updates               - This is where the external repos for f10 release and f10 updates are attached
      `- dist-f10-build             - This is the f10 build target with the 'build' and 'srpm-build' group inherited from dist-f9-build,
          |                           so that your buildroot gets populated but you do not have to maintain these groups for each
-         |                           seperate release.
+         |                           separate release.
          `- dist-f9-build          - etc.
              `- dist-f8-build      - etc.
 
diff --git a/docs/source/migrating_to_1.12.rst b/docs/source/migrating_to_1.12.rst
index 166e54c..8481fe4 100644
--- a/docs/source/migrating_to_1.12.rst
+++ b/docs/source/migrating_to_1.12.rst
@@ -41,7 +41,7 @@ The new ``dist-repo`` command creates rpm repos suitable for distribution.
 
 The new ``save-failed-tree`` command allows the a task owner (or admin)
 to download information from the buildroot of a failed build. This feature
-requires the ``save_failed_tree`` plugin to be enabled on the hub and buidlers.
+requires the ``save_failed_tree`` plugin to be enabled on the hub and builders.
 
 
 Configuration
diff --git a/docs/source/server_howto.rst b/docs/source/server_howto.rst
index 50f2fbf..4466593 100644
--- a/docs/source/server_howto.rst
+++ b/docs/source/server_howto.rst
@@ -135,7 +135,7 @@ koji components.
     default_md              = sha256
     distinguished_name      = req_distinguished_name
     attributes              = req_attributes
-    x509_extensions         = v3_ca # The extentions to add to the self signed cert
+    x509_extensions         = v3_ca # The extensions to add to the self signed cert
     string_mask             = MASK:0x2002
 
     [req_distinguished_name] 
@@ -1063,7 +1063,7 @@ certificates you generated at the beginning of the setup process.
     ;certificate of the CA that issued the HTTP server certificate
     serverca = /etc/kojid/koji_ca_cert.crt
 
-It is important to note that if your builders are hosted on seperate machines
+It is important to note that if your builders are hosted on separate machines
 from koji hub and koji web, you will need to scp the certificates mentioned in
 the above configuration file from the ``/etc/kojid/`` directory on koji hub to
 the ``/etc/koji/`` directory on the local machine so that the builder can be
diff --git a/docs/source/using_the_koji_build_system.rst b/docs/source/using_the_koji_build_system.rst
index 31f53c0..9a6ba21 100644
--- a/docs/source/using_the_koji_build_system.rst
+++ b/docs/source/using_the_koji_build_system.rst
@@ -73,7 +73,7 @@ Authority used to sign the user keys.) : It can be manually downloaded
 from
 `here <https://admin.fedoraproject.org/accounts/fedora-upload-ca.cert>`__
 or ``fedora-packager-setup or fedora-cert -n`` should fetch it. using
-the CLI is prefered.
+the CLI is preferred.
 ``~/.fedora-server-ca.cert`` (The certificate for the Certificate
 Authority used to sign the build system's server keys.) : It can be
 downloaded manually from
diff --git a/hub/kojihub.py b/hub/kojihub.py
index c73a13f..8b137d0 100644
--- a/hub/kojihub.py
+++ b/hub/kojihub.py
@@ -12005,7 +12005,7 @@ class HostExports(object):
 
     def failBuild(self, task_id, build_id):
         """Mark the build as failed.  If the current state is not
-        'BUILDING', or the current competion_time is not null, a
+        'BUILDING', or the current completion_time is not null, a
         GenericError will be raised."""
         host = Host()
         host.verify()
diff --git a/koji/__init__.py b/koji/__init__.py
index 835d96a..816e376 100644
--- a/koji/__init__.py
+++ b/koji/__init__.py
@@ -2733,7 +2733,7 @@ class DBHandler(logging.Handler):
             cursor.execute(command, data)
             cursor.close()
             #self.cnx.commit()
-            #XXX - commiting here is most likely wrong, but we need to set commit_pending or something
+            #XXX - committing here is most likely wrong, but we need to set commit_pending or something
             #      ...and this is really the wrong place for that
         except:
             self.handleError(record)
diff --git a/koji/auth.py b/koji/auth.py
index e095c5d..73bff2c 100644
--- a/koji/auth.py
+++ b/koji/auth.py
@@ -134,7 +134,7 @@ class Session(object):
                     #Some explanation:
                     #This function is one of the few that performs its own commit.
                     #However, our storage of the current callnum is /after/ that
-                    #commit. This means the the current callnum only gets commited if
+                    #commit. This means the the current callnum only gets committed if
                     #a commit happens afterward.
                     #We only schedule a commit for dml operations, so if we find the
                     #callnum in the db then a previous attempt succeeded but failed to
diff --git a/util/koji-shadow b/util/koji-shadow
index 233d33d..37c2811 100755
--- a/util/koji-shadow
+++ b/util/koji-shadow
@@ -148,7 +148,7 @@ def get_options():
     parser.add_option("--rules-protectlist",
                       help=_("Rules: list of package names to never replace"))
     parser.add_option("--tag-build", action="store_true", default=False,
-                      help=_("tag sucessful builds into the tag we are building, default is to not tag"))
+                      help=_("tag successful builds into the tag we are building, default is to not tag"))
     parser.add_option("--logfile",
                       help=_("file where everything gets logged"))
     parser.add_option("--arches",

