almalinux/pungi
14
1
Fork 0
Code Issues Pull Requests Releases Activity

Fix typos

Browse Source 
Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
This commit is contained in:
Lubomír Sedlář 2020-06-22 11:30:56 +02:00
parent b6573fab92
commit 54882a0fc4
13 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
doc/configuration.rst
View File

@ -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
<https://github.com/candlepin/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

4
doc/examples.rst
View File

@ -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',

2
doc/multi_compose.rst
View File

@ -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.

2
pungi/metadata.py
View File

@ -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 ""
)

2
pungi/phases/createrepo.py
View File

@ -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.
"""

4
pungi/phases/gather/__init__.py
View File

@ -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

2
pungi/phases/gather/methods/method_hybrid.py
View File

@ -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()

2
pungi/phases/live_images.py
View File

@ -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

2
pungi/phases/pkgset/pkgsets.py
View File

@ -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"]

2
pungi/runroot.py
View File

@ -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":

10
pungi/util.py
View File

@ -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

2
pungi_utils/patch_iso.py
View File

@ -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)