From 54882a0fc407a06928cef7411018860620561042 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= Date: Mon, 22 Jun 2020 11:30:56 +0200 Subject: [PATCH] Fix typos MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Lubomír Sedlář --- doc/configuration.rst | 12 ++++++------ doc/examples.rst | 4 ++-- doc/multi_compose.rst | 2 +- pungi/metadata.py | 2 +- pungi/phases/buildinstall.py | 2 +- pungi/phases/createrepo.py | 2 +- pungi/phases/gather/__init__.py | 4 ++-- pungi/phases/gather/methods/method_hybrid.py | 2 +- pungi/phases/live_images.py | 2 +- pungi/phases/pkgset/pkgsets.py | 2 +- pungi/runroot.py | 2 +- pungi/util.py | 10 +++++----- pungi_utils/patch_iso.py | 2 +- 13 files changed, 24 insertions(+), 24 deletions(-) diff --git a/doc/configuration.rst b/doc/configuration.rst index 0f9325e1..43063c10 100644 --- a/doc/configuration.rst +++ b/doc/configuration.rst @@ -183,7 +183,7 @@ Options **cts_keytab** (*str*) -- Path to Kerberos keytab which will be used for Compose - Tracking Service Kerberos authentification. If not defined, the default + Tracking Service Kerberos authentication. If not defined, the default Kerberos principal is used. **compose_type** @@ -355,7 +355,7 @@ images. You must provide few configuration options: (*str*) -- Path to a file with password that will be formatted into **signing_command** string via ``%(signing_key_password)s`` string format syntax (if used). - Because pungi config is usualy stored in git and is part of compose + Because pungi config is usually stored in git and is part of compose logs we don't want password to be included directly in the config. Note: If ``-`` string is used instead of a filename, then you will be asked for the password interactivelly right after pungi starts. @@ -453,7 +453,7 @@ Options ``productid`` file in the ``repodata`` directories. The purpose of these ``productid`` files is to expose the product data to `subscription-manager `_. - subscription-manager inclues a "product-id" Yum plugin that can read these + subscription-manager includes a "product-id" Yum plugin that can read these ``productid`` certificate files from each Yum repository. **product_id_allow_missing** = False @@ -526,7 +526,7 @@ Options (*str|[str]*) -- RPM scratch build task(s) to include in a package set, defined as task IDs. This option can be used only when ``compose_type`` is set to ``test``. The RPM still needs to have higher NVR than any - other RPM with the same name comming from other sources in order to + other RPM with the same name coming from other sources in order to appear in the resulting compose. **pkgset_koji_module_tag** @@ -1053,7 +1053,7 @@ Options * ``{runroot_key}`` - Replaced with the string returned by ``runroot_ssh_init_template`` if used. This can be used to keep the track - of context of SSH commands beloging to single runroot task. + of context of SSH commands belonging to single runroot task. * ``{packages}`` - White-list separated list of packages to install. Example (The ``{runroot_key}`` is expected to be set to mock config file @@ -1071,7 +1071,7 @@ Options * ``{runroot_key}`` - Replaced with the string returned by ``runroot_ssh_init_template`` if used. This can be used to keep the track - of context of SSH commands beloging to single runroot task. + of context of SSH commands belonging to single runroot task. * ``{command}`` - Command to run. Example (The ``{runroot_key}`` is expected to be set to mock config file diff --git a/doc/examples.rst b/doc/examples.rst index a8a18d3a..956383da 100644 --- a/doc/examples.rst +++ b/doc/examples.rst @@ -4,7 +4,7 @@ Big picture examples ==================== Actual Pungi configuration files can get very large. This pages brings two -examples of (almost) full configuation for two different composes. +examples of (almost) full configuration for two different composes. Fedora Rawhide compose ---------------------- @@ -250,7 +250,7 @@ This is a shortened configuration for Fedora Radhide compose as of 2019-10-14. ], '^Spins': [ # There are multiple media for Spins variant. They use subvariant - # field so that they can be indentified in the metadata. + # field so that they can be identified in the metadata. { 'name': 'Fedora-KDE-Live', 'kickstart': 'fedora-live-kde.ks', diff --git a/doc/multi_compose.rst b/doc/multi_compose.rst index f809d5f0..f0c26e28 100644 --- a/doc/multi_compose.rst +++ b/doc/multi_compose.rst @@ -34,7 +34,7 @@ General settings **release_type** Type of the product for the final compose. **extra_args** - Additional arguments that wil be passed to the child Pungi processes. + Additional arguments that will be passed to the child Pungi processes. **koji_profile** If specified, a current event will be retrieved from the Koji instance and used for all parts. diff --git a/pungi/metadata.py b/pungi/metadata.py index 995cd18e..2428ddc8 100644 --- a/pungi/metadata.py +++ b/pungi/metadata.py @@ -239,7 +239,7 @@ def compose_to_composeinfo(compose): compose.paths.compose.topdir().rstrip("/") + "/", ).rstrip("/") """ - # XXX: not suported (yet?) + # XXX: not supported (yet?) debug_iso_dir = ( compose.paths.compose.debug_iso_dir(arch=arch, variant=variant) or "" ) diff --git a/pungi/phases/buildinstall.py b/pungi/phases/buildinstall.py index b9e9b9d3..63dd7e3e 100644 --- a/pungi/phases/buildinstall.py +++ b/pungi/phases/buildinstall.py @@ -671,7 +671,7 @@ class BuildinstallThread(WorkerThread): compose.log_info(log_msg % "pungi_buildinstall plugin is not used.") return - # Filter out "outputdir" and "sources" because they change everytime. + # Filter out "outputdir" and "sources" because they change every time. # The "sources" are not important, because we check the buildinstall # input on RPM level. cmd_copy = copy(cmd) diff --git a/pungi/phases/createrepo.py b/pungi/phases/createrepo.py index 3e5c7b57..9b8a0961 100644 --- a/pungi/phases/createrepo.py +++ b/pungi/phases/createrepo.py @@ -388,7 +388,7 @@ def get_productids_from_scm(compose): def _get_old_package_dirs(compose, repo_dir): - """Given a compose and a path to a repo in it, try to find corresponging + """Given a compose and a path to a repo in it, try to find corresponding repo in an older compose and return a list of paths to directories with packages in it. """ diff --git a/pungi/phases/gather/__init__.py b/pungi/phases/gather/__init__.py index 348cee7e..436d582f 100644 --- a/pungi/phases/gather/__init__.py +++ b/pungi/phases/gather/__init__.py @@ -312,7 +312,7 @@ def reuse_old_gather_packages(compose, arch, variant, package_sets): rpm_obj.name, ) - # With the current aproach, we cannot reuse old gather result in case + # With the current approach, we cannot reuse old gather result in case # there are multiple RPMs with the same arch, sourcerpm and name. if key in key_to_old_rpm_obj: compose.log_info( @@ -340,7 +340,7 @@ def reuse_old_gather_packages(compose, arch, variant, package_sets): compose.log_info(log_msg % "some RPMs have been added.") return - # Check that requires or provides of this RPM is stil the same. + # Check that requires or provides of this RPM is still the same. old_rpm_obj, old_result_key, old_result_record = key_to_old_rpm_obj[key] if ( old_rpm_obj.requires != rpm_obj.requires diff --git a/pungi/phases/gather/methods/method_hybrid.py b/pungi/phases/gather/methods/method_hybrid.py index 85ed77d3..5d143199 100644 --- a/pungi/phases/gather/methods/method_hybrid.py +++ b/pungi/phases/gather/methods/method_hybrid.py @@ -262,7 +262,7 @@ class GatherMethodHybrid(pungi.phases.gather.method.GatherMethodBase): logfile = self.compose.paths.log.log_file( arch, "hybrid-depsolver-%s-iter-%d" % (variant, step) ) - # Adding this environement variable will tell GLib not to prefix + # Adding this environment variable will tell GLib not to prefix # any log messages with the PID of the fus process (which is quite # useless for us anyway). env = os.environ.copy() diff --git a/pungi/phases/live_images.py b/pungi/phases/live_images.py index 90daa694..d2767aa2 100644 --- a/pungi/phases/live_images.py +++ b/pungi/phases/live_images.py @@ -353,7 +353,7 @@ class CreateLiveImageThread(WorkerThread): koji_task_id, signing_key_id ) - # Wait untill files are available + # Wait until files are available if wait_paths(rpm_paths, 60 * 15): # Files are ready return rpm_paths diff --git a/pungi/phases/pkgset/pkgsets.py b/pungi/phases/pkgset/pkgsets.py index 67188b3f..bd7e8764 100644 --- a/pungi/phases/pkgset/pkgsets.py +++ b/pungi/phases/pkgset/pkgsets.py @@ -496,7 +496,7 @@ class KojiPackageSet(PackageSetBase): def get_package_path(self, queue_item): rpm_info, build_info = queue_item - # Check if this RPM is comming from scratch task. In this case, we already + # Check if this RPM is coming from scratch task. In this case, we already # know the path. if "path_from_task" in rpm_info: return rpm_info["path_from_task"] diff --git a/pungi/runroot.py b/pungi/runroot.py index 174f822d..fb1a6dfe 100644 --- a/pungi/runroot.py +++ b/pungi/runroot.py @@ -231,7 +231,7 @@ class Runroot(kobo.log.LoggingBase): executed. :param str output_dir: Directory where the `command` stores its output. The permissions of this output_dir might be changed by `runroot_method` - to allow the executor of this runroot task to accesss them. + to allow the executor of this runroot task to access them. See `KojiWrapper.get_runroot_cmd()` for more information. """ if self.runroot_method == "local": diff --git a/pungi/util.py b/pungi/util.py index 98108997..0e89ad6a 100644 --- a/pungi/util.py +++ b/pungi/util.py @@ -102,7 +102,7 @@ def _ensuredir(target, logger, force=False, clean=False): """Ensure that a directory exists, if it already exists, only continue if force is set.""" - # We have to check existance of a logger, as setting the logger could + # We have to check existence of a logger, as setting the logger could # itself cause an issue. def whoops(func, path, exc_info): message = "Could not remove %s" % path @@ -229,7 +229,7 @@ def pkg_is_debug(pkg_obj): return DEBUG_PATTERN_RE.match(name) -# fomat: [(variant_uid_regex, {arch|*: [data]})] +# format: [(variant_uid_regex, {arch|*: [data]})] def get_arch_variant_data(conf, var_name, arch, variant, keys=None): result = [] for conf_variant, conf_data in conf.get(var_name, []): @@ -354,7 +354,7 @@ class GitUrlResolver(object): return self.cache[key] -# fomat: {arch|*: [data]} +# format: {arch|*: [data]} def get_arch_data(conf, var_name, arch): result = [] for conf_arch, conf_data in conf.get(var_name, {}).items(): @@ -747,7 +747,7 @@ def run_unmount_cmd(cmd, max_retries=10, path=None, logger=None): """Attempt to run the command to unmount an image. If the command fails and stderr complains about device being busy, try - again. We will do up to ``max_retries`` attemps with increasing pauses. + again. We will do up to ``max_retries`` attempts with increasing pauses. If both path and logger are specified, more debugging information will be printed in case of failure. @@ -799,7 +799,7 @@ def translate_path_raw(mapping, path): if normpath.startswith(prefix): # We can't call os.path.normpath on result since it is not actually # a path - http:// would get changed to http:/ and so on. - # Only the first occurance should be replaced. + # Only the first occurrence should be replaced. return normpath.replace(prefix, newvalue, 1) return normpath diff --git a/pungi_utils/patch_iso.py b/pungi_utils/patch_iso.py index 28694155..8588d83b 100644 --- a/pungi_utils/patch_iso.py +++ b/pungi_utils/patch_iso.py @@ -135,6 +135,6 @@ def run(log, opts): opts.supported or iso.get_checkisomd5_data(opts.source)["Supported ISO"] ) # implantmd5 + supported bit (use the same as on source iso, unless - # overriden by --supported option) + # overridden by --supported option) isomd5sum_cmd = iso.get_implantisomd5_cmd(target, supported) sh(log, isomd5sum_cmd)