rpms/leapp-repository
5
0
Fork 1
Code Issues Pull Requests Releases Activity
bc6151463d
leapp-repository/SOURCES/0006-Add-codespell-GitHub-actions-workflow-for-spell-chec.patch
CentOS Sources bc6151463d import leapp-repository-0.17.0-8.el8
2023-03-29 09:01:41 +00:00

1876 lines
106 KiB
Diff
Raw Blame History

From c3f32c8cd95011b9fb6b4c8a9ee27736ba551ae2 Mon Sep 17 00:00:00 2001
From: Matej Matuska <mmatuska@redhat.com>
Date: Tue, 23 Aug 2022 11:04:55 +0200
Subject: [PATCH 06/32] Add codespell GitHub actions workflow for spell
checking code
Use [codespell](https://github.com/codespell-project/actions-codespell)
for spell checking code in PRs and pushes to master.
All existing typos are fixed or ignored in the following way:
- Files without any words to check are skipped, as they would just
create false positives.
- Words like `ro` and `fo` are ignored since they are pretty common in
the codebase and we don't want to trouble contributors with excluding
every line containing these from spell checking. It's up to
maintainers to spot these false negatives.
---
.github/workflows/codespell.yml | 23 ++++++++++++++++++
.github/workflows/pr-welcome-msg.yml | 2 +-
.github/workflows/reuse-copr-build.yml | 2 +-
Makefile | 2 +-
commands/command_utils.py | 2 +-
packaging/leapp-repository.spec | 8 +++----
.../baculacheck/tests/test_baculacheck.py | 4 ++--
.../biosdevname/libraries/biosdevname.py | 2 +-
.../biosdevname/tests/test_biosdevname.py | 2 +-
.../libraries/checkbootavailspace.py | 2 +-
.../tests/test_checkyumpluginsenabled.py | 2 +-
.../actors/cloud/checkhybridimage/actor.py | 2 +-
.../grubenvtofile/tests/test_grubenvtofile.py | 2 +-
.../dracut/85sys-upgrade-redhat/do-upgrade.sh | 4 ++--
.../dracut/85sys-upgrade-redhat/mount_usr.sh | 2 +-
.../files/leapp_resume.service | 2 +-
.../tests/test_enablerhsmtargetrepos.py | 5 ++--
.../tests/test_targetinitramfsgenerator.py | 4 ++--
.../libraries/upgradeinitramfsgenerator.py | 2 +-
.../unit_test_upgradeinitramfsgenerator.py | 2 +-
.../tests/test_ipuworkflowconfig.py | 2 +-
.../libraries/checkinstalledkernels.py | 2 +-
.../libraries/readopensshconfig.py | 12 +++++-----
.../opensshpermitrootlogincheck/actor.py | 6 ++---
.../actors/persistentnetnamesconfig/actor.py | 2 +-
.../libraries/persistentnetnamesconfig.py | 2 +-
.../libraries/peseventsscanner_repomap.py | 4 ++--
.../tests/test_scanfilesfortargetuserspace.py | 4 ++--
.../scansaphana/libraries/scansaphana.py | 2 +-
.../scansubscriptionmanagerinfo/actor.py | 2 +-
.../selinux/selinuxapplycustom/actor.py | 2 +-
.../libraries/selinuxcontentscanner.py | 2 +-
.../common/actors/setuptargetrepos/actor.py | 2 +-
.../libraries/setuptargetrepos_repomap.py | 4 ++--
.../tests/test_repomapping.py | 8 +++----
.../systemfacts/libraries/systemfacts.py | 4 ++--
.../libraries/userspacegen.py | 8 +++----
.../tests/unit_test_targetuserspacecreator.py | 2 +-
.../actors/unsupportedupgradecheck/actor.py | 2 +-
.../tests/test_updategrubcore.py | 2 +-
.../common/files/rhel_upgrade.py | 2 +-
.../common/libraries/config/__init__.py | 2 +-
.../common/libraries/dnfconfig.py | 2 +-
.../common/libraries/dnfplugin.py | 4 ++--
.../system_upgrade/common/libraries/guards.py | 2 +-
.../common/libraries/mounting.py | 2 +-
.../common/libraries/overlaygen.py | 2 +-
.../common/libraries/tests/test_grub.py | 2 +-
.../common/libraries/tests/test_rhsm.py | 2 +-
.../system_upgrade/common/libraries/utils.py | 6 ++---
repos/system_upgrade/common/models/cpuinfo.py | 2 +-
.../common/models/dnfplugintask.py | 2 +-
.../system_upgrade/common/models/initramfs.py | 4 ++--
.../common/models/installeddesktopsfacts.py | 2 +-
repos/system_upgrade/common/models/module.py | 2 +-
.../common/models/opensshconfig.py | 2 +-
.../common/models/targetuserspace.py | 2 +-
.../common/workflows/inplace_upgrade.py | 4 ++--
.../el7toel8/actors/bindupdate/actor.py | 2 +-
.../actors/bindupdate/libraries/updates.py | 2 +-
.../actors/checkremovedpammodules/actor.py | 4 ++--
.../checksaphana/libraries/checksaphana.py | 2 +-
.../actors/cupscheck/libraries/cupscheck.py | 4 ++--
.../grubdevname/tests/test_grubdevname.py | 2 +-
.../actors/multipathconfread/actor.py | 2 +-
.../actors/multipathconfupdate/actor.py | 2 +-
.../tests/test_postgresqlcheck.py | 4 ++--
.../quaggatofrr/libraries/quaggatofrr.py | 2 +-
.../actors/quaggatofrr/tests/files/daemons | 2 +-
.../tests/test_unit_quaggatofrr.py | 2 +-
.../actors/satellite_upgrade_facts/actor.py | 2 +-
.../sctpconfigread/libraries/sctplib.py | 2 +-
.../libraries/spamassassinconfigcheck.py | 2 +-
.../test_library_spamassassinconfigcheck.py | 2 +-
.../actors/spamassassinconfigread/actor.py | 2 +-
.../libraries/spamassassinconfigread.py | 2 +-
.../test_lib_spamd_spamassassinconfigread.py | 24 +++++++++----------
...test_lib_spamd_spamassassinconfigupdate.py | 2 +-
.../libraries/tcpwrapperscheck.py | 6 ++---
.../libraries/ziplcheckbootentries.py | 4 ++--
.../actors/ziplconverttoblscfg/actor.py | 2 +-
.../el7toel8/libraries/isccfg.py | 6 ++---
.../el7toel8/libraries/vsftpdutils.py | 4 ++--
.../el7toel8/models/spamassassinfacts.py | 2 +-
.../actors/checkblsgrubcfgonppc64/actor.py | 2 +-
.../el8toel9/actors/checkvdo/actor.py | 2 +-
.../actors/checkvdo/libraries/checkvdo.py | 2 +-
.../actors/dotnet/tests/test_dotnet.py | 2 +-
.../mariadbcheck/tests/test_mariadbcheck.py | 4 ++--
.../actors/multipathconfread/actor.py | 2 +-
.../actors/nischeck/libraries/nischeck.py | 2 +-
.../actors/nischeck/tests/test_nischeck.py | 6 ++---
.../actors/nisscanner/libraries/nisscan.py | 2 +-
.../actors/nisscanner/tests/test_nisscan.py | 6 ++---
.../libraries/opensshdropindirectory.py | 2 +-
.../opensshdropindirectorycheck/actor.py | 2 +-
.../libraries/add_provider.py | 2 +-
.../tests/test_postgresqlcheck.py | 4 ++--
.../actors/pythonthreetmpworkaround/actor.py | 2 +-
.../targetuserspacecryptopolicies.py | 2 +-
.../actors/vdoconversionscanner/actor.py | 2 +-
.../el8toel9/models/opensslconfig.py | 2 +-
utils/ibdmp-decode | 2 +-
103 files changed, 181 insertions(+), 157 deletions(-)
create mode 100644 .github/workflows/codespell.yml
diff --git a/.github/workflows/codespell.yml b/.github/workflows/codespell.yml
new file mode 100644
index 00000000..e7532d98
--- /dev/null
+++ b/.github/workflows/codespell.yml
@@ -0,0 +1,23 @@
+name: Codespell
+
+on:
+ push:
+ branches:
+ - master
+ pull_request:
+ branches:
+ - master
+
+jobs:
+ codespell:
+ name: Check for spelling errors
+ runs-on: ubuntu-latest
+
+ steps:
+ - uses: actions/checkout@v3
+ - uses: codespell-project/actions-codespell@master
+ with:
+ ignore_words_list: ro,fo
+ skip: "./repos/system_upgrade/common/actors/storagescanner/tests/files/mounts,\
+ ./repos/system_upgrade/el7toel8/actors/networkmanagerreadconfig/tests/files/nm_cfg_file_error,\
+ ./repos/system_upgrade/common/actors/scancpu/tests/files/lscpu_s390x"
diff --git a/.github/workflows/pr-welcome-msg.yml b/.github/workflows/pr-welcome-msg.yml
index c4435578..7ae2fa4e 100644
--- a/.github/workflows/pr-welcome-msg.yml
+++ b/.github/workflows/pr-welcome-msg.yml
@@ -19,7 +19,7 @@ jobs:
issue-number: ${{ github.event.pull_request.number }}
body: |
## **Thank you for contributing to the Leapp project!**
- Please note that every PR needs to comply with the [Leapp Guidelines](https://leapp.readthedocs.io/en/latest/contributing.html#) and must pass all tests in order to be mergable.
+ Please note that every PR needs to comply with the [Leapp Guidelines](https://leapp.readthedocs.io/en/latest/contributing.html#) and must pass all tests in order to be mergeable.
If you want to request a review or rebuild a package in copr, you can use following commands as a comment:
- **review please** to notify leapp developers of review request
- **/packit copr-build** to submit a public copr build using packit
diff --git a/.github/workflows/reuse-copr-build.yml b/.github/workflows/reuse-copr-build.yml
index 08d78024..477d3f40 100644
--- a/.github/workflows/reuse-copr-build.yml
+++ b/.github/workflows/reuse-copr-build.yml
@@ -35,7 +35,7 @@ jobs:
echo "::set-output name=pr_nr::${PR_URL##*/}"
- name: Checkout
- # TODO: The correct way to checkout would be to use simmilar approach as in get_commit_by_timestamp function of
+ # TODO: The correct way to checkout would be to use similar approach as in get_commit_by_timestamp function of
# the github gluetool module (i.e. do not use HEAD but the last commit before comment).
id: checkout
uses: actions/checkout@v2
diff --git a/Makefile b/Makefile
index 5650973c..e8d9f170 100644
--- a/Makefile
+++ b/Makefile
@@ -60,7 +60,7 @@ endif
# someone will call copr_build without additional parameters
MASTER_BRANCH=master
-# In case the PR or MR is defined or in case build is not comming from the
+# In case the PR or MR is defined or in case build is not coming from the
# MATER_BRANCH branch, N_REL=0; (so build is not update of the approved
# upstream solution). For upstream builds N_REL=100;
N_REL=`_NR=$${PR:+0}; if test "$${_NR:-100}" == "100"; then _NR=$${MR:+0}; fi; git rev-parse --abbrev-ref HEAD | grep -qE "^($(MASTER_BRANCH)|stable)$$" || _NR=0; echo $${_NR:-100}`
diff --git a/commands/command_utils.py b/commands/command_utils.py
index da62c50d..451324ee 100644
--- a/commands/command_utils.py
+++ b/commands/command_utils.py
@@ -43,7 +43,7 @@ def get_major_version(version):
def detect_sap_hana():
"""
- Detect SAP HANA based on existance of /hana/shared/*/exe/linuxx86_64/hdb/sapcontrol
+ Detect SAP HANA based on existence of /hana/shared/*/exe/linuxx86_64/hdb/sapcontrol
"""
if os.path.exists(HANA_BASE_PATH):
for entry in os.listdir(HANA_BASE_PATH):
diff --git a/packaging/leapp-repository.spec b/packaging/leapp-repository.spec
index 5411fbb2..c59f8acd 100644
--- a/packaging/leapp-repository.spec
+++ b/packaging/leapp-repository.spec
@@ -70,7 +70,7 @@ Requires: python2-leapp
Obsoletes: leapp-repository-data <= 0.6.1
Provides: leapp-repository-data <= 0.6.1
-# Former leapp subpackage that is part of the sos package since HEL 7.8
+# Former leapp subpackage that is part of the sos package since RHEL 7.8
Obsoletes: leapp-repository-sos-plugin <= 0.9.0
# Set the conflict to be sure this RPM is not upgraded automatically to
@@ -90,7 +90,7 @@ Conflicts: leapp-upgrade-el7toel8
%endif
-# IMPORTANT: everytime the requirements are changed, increment number by one
+# IMPORTANT: every time the requirements are changed, increment number by one
# - same for Provides in deps subpackage
Requires: leapp-repository-dependencies = %{leapp_repo_deps}
@@ -124,7 +124,7 @@ Leapp repositories for the in-place upgrade to the next major version
of the Red Hat Enterprise Linux system.
-# This metapackage should contain all RPM dependencies exluding deps on *leapp*
+# This metapackage should contain all RPM dependencies excluding deps on *leapp*
# RPMs. This metapackage will be automatically replaced during the upgrade
# to satisfy dependencies with RPMs from target system.
%package -n %{lpr_name}-deps
@@ -133,7 +133,7 @@ Summary: Meta-package with system dependencies of %{lpr_name} package
# The package has been renamed, so let's obsoletes the old one
Obsoletes: leapp-repository-deps < 0.14.0-%{release}
-# IMPORTANT: everytime the requirements are changed, increment number by one
+# IMPORTANT: every time the requirements are changed, increment number by one
# - same for Requires in main package
Provides: leapp-repository-dependencies = %{leapp_repo_deps}
##################################################
diff --git a/repos/system_upgrade/common/actors/baculacheck/tests/test_baculacheck.py b/repos/system_upgrade/common/actors/baculacheck/tests/test_baculacheck.py
index ec4e7f81..6f81d5f7 100644
--- a/repos/system_upgrade/common/actors/baculacheck/tests/test_baculacheck.py
+++ b/repos/system_upgrade/common/actors/baculacheck/tests/test_baculacheck.py
@@ -35,7 +35,7 @@ def test_actor_execution(monkeypatch, has_director):
Parametrized helper function for test_actor_* functions.
First generate list of RPM models based on set arguments. Then, run
- the actor feeded with our RPM list. Finally, assert Reports
+ the actor fed with our RPM list. Finally, assert Reports
according to set arguments.
Parameters:
@@ -54,7 +54,7 @@ def test_actor_execution(monkeypatch, has_director):
monkeypatch.setattr(api, 'current_actor', curr_actor_mocked)
monkeypatch.setattr(reporting, "create_report", create_report_mocked())
- # Executed actor feeded with out fake RPMs
+ # Executed actor fed with out fake RPMs
report_installed_packages(_context=api)
if has_director:
diff --git a/repos/system_upgrade/common/actors/biosdevname/libraries/biosdevname.py b/repos/system_upgrade/common/actors/biosdevname/libraries/biosdevname.py
index 5d44c58a..a6b4a242 100644
--- a/repos/system_upgrade/common/actors/biosdevname/libraries/biosdevname.py
+++ b/repos/system_upgrade/common/actors/biosdevname/libraries/biosdevname.py
@@ -38,7 +38,7 @@ def all_interfaces_biosdevname(interfaces):
def enable_biosdevname():
api.current_logger().info(
- "Biosdevname naming scheme in use, explicitely enabling biosdevname on the target RHEL system"
+ "Biosdevname naming scheme in use, explicitly enabling biosdevname on the target RHEL system"
)
api.produce(KernelCmdlineArg(**{'key': 'biosdevname', 'value': '1'}))
diff --git a/repos/system_upgrade/common/actors/biosdevname/tests/test_biosdevname.py b/repos/system_upgrade/common/actors/biosdevname/tests/test_biosdevname.py
index 05a38ac6..c60aa7a4 100644
--- a/repos/system_upgrade/common/actors/biosdevname/tests/test_biosdevname.py
+++ b/repos/system_upgrade/common/actors/biosdevname/tests/test_biosdevname.py
@@ -112,7 +112,7 @@ def test_enable_biosdevname(monkeypatch):
biosdevname.enable_biosdevname()
assert (
- "Biosdevname naming scheme in use, explicitely enabling biosdevname on the target RHEL system"
+ "Biosdevname naming scheme in use, explicitly enabling biosdevname on the target RHEL system"
in api.current_logger.infomsg
)
assert result[0].key == "biosdevname"
diff --git a/repos/system_upgrade/common/actors/checkbootavailspace/libraries/checkbootavailspace.py b/repos/system_upgrade/common/actors/checkbootavailspace/libraries/checkbootavailspace.py
index 9e174484..7380f335 100644
--- a/repos/system_upgrade/common/actors/checkbootavailspace/libraries/checkbootavailspace.py
+++ b/repos/system_upgrade/common/actors/checkbootavailspace/libraries/checkbootavailspace.py
@@ -29,7 +29,7 @@ def inhibit_upgrade(avail_bytes):
reporting.create_report([
reporting.Title('Not enough space on /boot'),
reporting.Summary(
- '/boot needs additional {0} MiB to be able to accomodate the upgrade initramfs and new kernel.'.format(
+ '/boot needs additional {0} MiB to be able to accommodate the upgrade initramfs and new kernel.'.format(
additional_mib_needed)
),
reporting.Severity(reporting.Severity.HIGH),
diff --git a/repos/system_upgrade/common/actors/checkyumpluginsenabled/tests/test_checkyumpluginsenabled.py b/repos/system_upgrade/common/actors/checkyumpluginsenabled/tests/test_checkyumpluginsenabled.py
index fa4462bd..896d31d5 100644
--- a/repos/system_upgrade/common/actors/checkyumpluginsenabled/tests/test_checkyumpluginsenabled.py
+++ b/repos/system_upgrade/common/actors/checkyumpluginsenabled/tests/test_checkyumpluginsenabled.py
@@ -47,7 +47,7 @@ def test_report_when_missing_required_plugins(monkeypatch):
check_required_yum_plugins_enabled(yum_config)
- assert actor_reports.called, 'Report wasn\'t created when required a plugin is missing.'
+ assert actor_reports.called, "Report wasn't created when required a plugin is missing."
fail_description = 'The missing required plugin is not mentioned in the report.'
assert 'subscription-manager' in actor_reports.report_fields['summary'], fail_description
diff --git a/repos/system_upgrade/common/actors/cloud/checkhybridimage/actor.py b/repos/system_upgrade/common/actors/cloud/checkhybridimage/actor.py
index 54a2d331..47f5fdd8 100644
--- a/repos/system_upgrade/common/actors/cloud/checkhybridimage/actor.py
+++ b/repos/system_upgrade/common/actors/cloud/checkhybridimage/actor.py
@@ -9,7 +9,7 @@ class CheckHybridImage(Actor):
Check if the system is using Azure hybrid image.
These images have a default relative symlink to EFI
- partion even when booted using BIOS and in such cases
+ partition even when booted using BIOS and in such cases
GRUB is not able find "grubenv" to get the kernel cmdline
options and fails to boot after upgrade`.
"""
diff --git a/repos/system_upgrade/common/actors/cloud/grubenvtofile/tests/test_grubenvtofile.py b/repos/system_upgrade/common/actors/cloud/grubenvtofile/tests/test_grubenvtofile.py
index a8710691..807f5efa 100644
--- a/repos/system_upgrade/common/actors/cloud/grubenvtofile/tests/test_grubenvtofile.py
+++ b/repos/system_upgrade/common/actors/cloud/grubenvtofile/tests/test_grubenvtofile.py
@@ -8,7 +8,7 @@ from leapp.models import HybridImage
def raise_call_error(args=None):
raise CalledProcessError(
- message='A Leapp Command Error occured.',
+ message='A Leapp Command Error occurred.',
command=args,
result={'signal': None, 'exit_code': 1, 'pid': 0, 'stdout': 'fake', 'stderr': 'fake'}
)
diff --git a/repos/system_upgrade/common/actors/commonleappdracutmodules/files/dracut/85sys-upgrade-redhat/do-upgrade.sh b/repos/system_upgrade/common/actors/commonleappdracutmodules/files/dracut/85sys-upgrade-redhat/do-upgrade.sh
index 17d67315..1f39a6b2 100755
--- a/repos/system_upgrade/common/actors/commonleappdracutmodules/files/dracut/85sys-upgrade-redhat/do-upgrade.sh
+++ b/repos/system_upgrade/common/actors/commonleappdracutmodules/files/dracut/85sys-upgrade-redhat/do-upgrade.sh
@@ -47,7 +47,7 @@ export NSPAWN_OPTS="$NSPAWN_OPTS --keep-unit --register=no --timezone=off --reso
#
-# Temp for collecting and preparing tarbal
+# Temp for collecting and preparing tarball
#
LEAPP_DEBUG_TMP="/tmp/leapp-debug-root"
@@ -135,7 +135,7 @@ ibdmp() {
# 3. decorate each chunk with prefix `N:` where
# N is number of given chunk.
#
- # 4. Finally print all lines (pre-pended "header"
+ # 4. Finally print all lines (prepended "header"
# line and all chunks) several times, where
# every iteration should be prefixed by
# `_ibdmp:I/TTL|` and suffixed by `|`.
diff --git a/repos/system_upgrade/common/actors/commonleappdracutmodules/files/dracut/85sys-upgrade-redhat/mount_usr.sh b/repos/system_upgrade/common/actors/commonleappdracutmodules/files/dracut/85sys-upgrade-redhat/mount_usr.sh
index 04ded4a3..3c52652f 100755
--- a/repos/system_upgrade/common/actors/commonleappdracutmodules/files/dracut/85sys-upgrade-redhat/mount_usr.sh
+++ b/repos/system_upgrade/common/actors/commonleappdracutmodules/files/dracut/85sys-upgrade-redhat/mount_usr.sh
@@ -75,7 +75,7 @@ mount_usr()
}
if [ -f "${NEWROOT}/etc/fstab" ]; then
- # Incase we have the LVM command available try make it activate all partitions
+ # In case we have the LVM command available try make it activate all partitions
if command -v lvm 2>/dev/null 1>/dev/null; then
lvm vgchange -a y
fi
diff --git a/repos/system_upgrade/common/actors/createresumeservice/files/leapp_resume.service b/repos/system_upgrade/common/actors/createresumeservice/files/leapp_resume.service
index 79cfa0be..39ac6112 100644
--- a/repos/system_upgrade/common/actors/createresumeservice/files/leapp_resume.service
+++ b/repos/system_upgrade/common/actors/createresumeservice/files/leapp_resume.service
@@ -8,7 +8,7 @@ Wants=network-online.target
[Service]
Type=oneshot
-# FIXME: this is temporary workround for Python3
+# FIXME: this is temporary workaround for Python3
ExecStart=/root/tmp_leapp_py3/leapp3 upgrade --resume
StandardOutput=journal+console
# FIXME: this shouldn't be needed, but Satellite upgrade runs installer, and that's slow
diff --git a/repos/system_upgrade/common/actors/enablerhsmtargetrepos/tests/test_enablerhsmtargetrepos.py b/repos/system_upgrade/common/actors/enablerhsmtargetrepos/tests/test_enablerhsmtargetrepos.py
index bccbbd80..12d53d26 100644
--- a/repos/system_upgrade/common/actors/enablerhsmtargetrepos/tests/test_enablerhsmtargetrepos.py
+++ b/repos/system_upgrade/common/actors/enablerhsmtargetrepos/tests/test_enablerhsmtargetrepos.py
@@ -27,7 +27,7 @@ def not_isolated_actions(raise_err=False):
def raise_call_error(args=None):
raise CalledProcessError(
- message='A Leapp Command Error occured.',
+ message='A Leapp Command Error occurred.',
command=args,
result={'signal': None, 'exit_code': 1, 'pid': 0, 'stdout': 'fake', 'stderr': 'fake'}
)
@@ -61,7 +61,8 @@ def test_setrelease_submgr_throwing_error(monkeypatch):
monkeypatch.setattr(mounting, 'NotIsolatedActions', klass)
monkeypatch.setattr(api, 'current_actor', CurrentActorMocked(dst_ver='8.0', envars={'LEAPP_NO_RHSM': '0'}))
monkeypatch.setattr(config, 'get_product_type', lambda dummy: 'ga')
- # free the set_release funtion from the @_rhsm_retry decorator which would otherwise cause 25 sec delay of the test
+ # free the set_release function from the @_rhsm_retry decorator
+ # which would otherwise cause 25 sec delay of the test
if sys.version_info.major < 3:
monkeypatch.setattr(rhsm, 'set_release',
rhsm.set_release.func_closure[0].cell_contents.func_closure[0].cell_contents)
diff --git a/repos/system_upgrade/common/actors/initramfs/targetinitramfsgenerator/tests/test_targetinitramfsgenerator.py b/repos/system_upgrade/common/actors/initramfs/targetinitramfsgenerator/tests/test_targetinitramfsgenerator.py
index f5930b9b..8403a431 100644
--- a/repos/system_upgrade/common/actors/initramfs/targetinitramfsgenerator/tests/test_targetinitramfsgenerator.py
+++ b/repos/system_upgrade/common/actors/initramfs/targetinitramfsgenerator/tests/test_targetinitramfsgenerator.py
@@ -13,7 +13,7 @@ from leapp.models import ( # isort:skip
TargetInitramfsTasks
)
-FILES = ['/file1', '/file2', '/dir/ect/ory/file3', '/file4', '/file5']
+FILES = ['/file1', '/file2', '/dir/subdir/subsubdir/file3', '/file4', '/file5']
MODULES = [
('moduleA', None),
('moduleB', None),
@@ -26,7 +26,7 @@ NO_INCLUDE_MSG = 'No additional files or modules required to add into the target
def raise_call_error(args=None):
raise CalledProcessError(
- message='A Leapp Command Error occured.',
+ message='A Leapp Command Error occurred.',
command=args,
result={'signal': None, 'exit_code': 1, 'pid': 0, 'stdout': 'fake', 'stderr': 'fake'})
diff --git a/repos/system_upgrade/common/actors/initramfs/upgradeinitramfsgenerator/libraries/upgradeinitramfsgenerator.py b/repos/system_upgrade/common/actors/initramfs/upgradeinitramfsgenerator/libraries/upgradeinitramfsgenerator.py
index 8e59d5f3..991ace0e 100644
--- a/repos/system_upgrade/common/actors/initramfs/upgradeinitramfsgenerator/libraries/upgradeinitramfsgenerator.py
+++ b/repos/system_upgrade/common/actors/initramfs/upgradeinitramfsgenerator/libraries/upgradeinitramfsgenerator.py
@@ -78,7 +78,7 @@ def _install_initram_deps(packages):
used_repos=used_repos)
-# duplicate of _copy_files fro userspacegen.py
+# duplicate of _copy_files from userspacegen.py
def _copy_files(context, files):
"""
Copy the files/dirs from the host to the `context` userspace
diff --git a/repos/system_upgrade/common/actors/initramfs/upgradeinitramfsgenerator/tests/unit_test_upgradeinitramfsgenerator.py b/repos/system_upgrade/common/actors/initramfs/upgradeinitramfsgenerator/tests/unit_test_upgradeinitramfsgenerator.py
index 2b401e52..13939df1 100644
--- a/repos/system_upgrade/common/actors/initramfs/upgradeinitramfsgenerator/tests/unit_test_upgradeinitramfsgenerator.py
+++ b/repos/system_upgrade/common/actors/initramfs/upgradeinitramfsgenerator/tests/unit_test_upgradeinitramfsgenerator.py
@@ -261,7 +261,7 @@ def test_generate_initram_disk(monkeypatch, input_msgs, modules):
# TODO(pstodulk): this test is not created properly, as context.call check
# is skipped completely. Testing will more convenient with fixed #376
- # similar fo the files...
+ # similar to the files...
def test_copy_dracut_modules_rmtree_ignore(monkeypatch):
diff --git a/repos/system_upgrade/common/actors/ipuworkflowconfig/tests/test_ipuworkflowconfig.py b/repos/system_upgrade/common/actors/ipuworkflowconfig/tests/test_ipuworkflowconfig.py
index 12e9bb45..a5e4d03b 100644
--- a/repos/system_upgrade/common/actors/ipuworkflowconfig/tests/test_ipuworkflowconfig.py
+++ b/repos/system_upgrade/common/actors/ipuworkflowconfig/tests/test_ipuworkflowconfig.py
@@ -24,7 +24,7 @@ def _clean_leapp_envs(monkeypatch):
def _raise_call_error(*args):
raise CalledProcessError(
- message='A Leapp Command Error occured.',
+ message='A Leapp Command Error occurred.',
command=args,
result={'signal': None, 'exit_code': 1, 'pid': 0, 'stdout': 'fake', 'stderr': 'fake'}
)
diff --git a/repos/system_upgrade/common/actors/kernel/checkinstalledkernels/libraries/checkinstalledkernels.py b/repos/system_upgrade/common/actors/kernel/checkinstalledkernels/libraries/checkinstalledkernels.py
index 7d6de89d..7dc5b2f2 100644
--- a/repos/system_upgrade/common/actors/kernel/checkinstalledkernels/libraries/checkinstalledkernels.py
+++ b/repos/system_upgrade/common/actors/kernel/checkinstalledkernels/libraries/checkinstalledkernels.py
@@ -113,7 +113,7 @@ def process():
raise StopActorExecutionError('Cannot find any installed kernel signed by Red Hat.')
if len(pkgs) > 1 and architecture.matches_architecture(architecture.ARCH_S390X):
- # It's temporary solution, so no need to try automatize everything.
+ # It's temporary solution, so no need to try automate everything.
title = 'Multiple kernels installed'
summary = ('The upgrade process does not handle well the case when multiple kernels'
' are installed on s390x. There is a severe risk of the bootloader configuration'
diff --git a/repos/system_upgrade/common/actors/opensshconfigscanner/libraries/readopensshconfig.py b/repos/system_upgrade/common/actors/opensshconfigscanner/libraries/readopensshconfig.py
index ba786025..e6cb9fcc 100644
--- a/repos/system_upgrade/common/actors/opensshconfigscanner/libraries/readopensshconfig.py
+++ b/repos/system_upgrade/common/actors/opensshconfigscanner/libraries/readopensshconfig.py
@@ -43,33 +43,33 @@ def parse_config(config):
ret.permit_root_login.append(v)
elif el[0].lower() == 'useprivilegeseparation':
- # Record only first occurence, which is effective
+ # Record only first occurrence, which is effective
if not ret.use_privilege_separation:
ret.use_privilege_separation = value
elif el[0].lower() == 'protocol':
- # Record only first occurence, which is effective
+ # Record only first occurrence, which is effective
if not ret.protocol:
ret.protocol = value
elif el[0].lower() == 'ciphers':
- # Record only first occurence, which is effective
+ # Record only first occurrence, which is effective
if not ret.ciphers:
ret.ciphers = value
elif el[0].lower() == 'macs':
- # Record only first occurence, which is effective
+ # Record only first occurrence, which is effective
if not ret.macs:
ret.macs = value
elif el[0].lower() == 'subsystem':
- # Record only first occurence, which is effective
+ # Record only first occurrence, which is effective
if el[1].lower() == 'sftp' and len(el) > 2 and not ret.subsystem_sftp:
# here we need to record all remaining items as command and arguments
ret.subsystem_sftp = ' '.join(el[2:])
elif el[0].lower() in DEPRECATED_DIRECTIVES:
- # Filter out duplicit occurences of the same deprecated directive
+ # Filter out duplicit occurrences of the same deprecated directive
if el[0].lower() not in ret.deprecated_directives:
# Use the directive in the form as found in config for user convenience
ret.deprecated_directives.append(el[0])
diff --git a/repos/system_upgrade/common/actors/opensshpermitrootlogincheck/actor.py b/repos/system_upgrade/common/actors/opensshpermitrootlogincheck/actor.py
index 52553aaf..2ac4ec8f 100644
--- a/repos/system_upgrade/common/actors/opensshpermitrootlogincheck/actor.py
+++ b/repos/system_upgrade/common/actors/opensshpermitrootlogincheck/actor.py
@@ -97,14 +97,14 @@ class OpenSshPermitRootLoginCheck(Actor):
'OpenSSH is configured to deny root logins in match '
'blocks, but not explicitly enabled in global or '
'"Match all" context. This update changes the '
- 'default to disable root logins using paswords '
- 'so your server migth get inaccessible.'
+ 'default to disable root logins using passwords '
+ 'so your server might get inaccessible.'
),
reporting.Severity(reporting.Severity.HIGH),
reporting.Groups(COMMON_REPORT_TAGS),
reporting.Remediation(
hint='Consider using different user for administrative '
- 'logins or make sure your configration file '
+ 'logins or make sure your configuration file '
'contains the line "PermitRootLogin yes" '
'in global context if desired.'
),
diff --git a/repos/system_upgrade/common/actors/persistentnetnamesconfig/actor.py b/repos/system_upgrade/common/actors/persistentnetnamesconfig/actor.py
index 31cad35c..2689d837 100644
--- a/repos/system_upgrade/common/actors/persistentnetnamesconfig/actor.py
+++ b/repos/system_upgrade/common/actors/persistentnetnamesconfig/actor.py
@@ -17,7 +17,7 @@ class PersistentNetNamesConfig(Actor):
Generate udev persistent network naming configuration
This actor generates systemd-udevd link files for each physical ethernet interface present on RHEL-7
- in case we notice that interace name differs on RHEL-8. Link file configuration will assign RHEL-7 version of
+ in case we notice that interface name differs on RHEL-8. Link file configuration will assign RHEL-7 version of
a name. Actors produces list of interfaces which changed name between RHEL-7 and RHEL-8.
"""
diff --git a/repos/system_upgrade/common/actors/persistentnetnamesconfig/libraries/persistentnetnamesconfig.py b/repos/system_upgrade/common/actors/persistentnetnamesconfig/libraries/persistentnetnamesconfig.py
index 6b3d6619..dc5196ea 100644
--- a/repos/system_upgrade/common/actors/persistentnetnamesconfig/libraries/persistentnetnamesconfig.py
+++ b/repos/system_upgrade/common/actors/persistentnetnamesconfig/libraries/persistentnetnamesconfig.py
@@ -100,7 +100,7 @@ def process():
api.produce(RenamedInterfaces(renamed=renamed_interfaces))
api.produce(InitrdIncludes(files=initrd_files))
- # TODO: cover actor by tests in future. I am skipping writting of tests
+ # TODO: cover actor by tests in future. I am skipping writing of tests
# now as some refactoring and bugfixing related to this actor
# is planned already.
api.produce(TargetInitramfsTasks(include_files=initrd_files))
diff --git a/repos/system_upgrade/common/actors/peseventsscanner/libraries/peseventsscanner_repomap.py b/repos/system_upgrade/common/actors/peseventsscanner/libraries/peseventsscanner_repomap.py
index 567e8475..95147782 100644
--- a/repos/system_upgrade/common/actors/peseventsscanner/libraries/peseventsscanner_repomap.py
+++ b/repos/system_upgrade/common/actors/peseventsscanner/libraries/peseventsscanner_repomap.py
@@ -155,7 +155,7 @@ class RepoMapDataHandler(object):
def get_source_pesid_repos(self, pesid):
"""
Return the list of PESIDRepositoryEntry objects for a specified PES ID
- mathing the source OS major version.
+ matching the source OS major version.
:param pesid: The PES ID for which to retrieve PESIDRepositoryEntries.
:type pesid: str
@@ -168,7 +168,7 @@ class RepoMapDataHandler(object):
def get_target_pesid_repos(self, pesid):
"""
Return the list of PESIDRepositoryEntry objects for a specified PES ID
- mathing the target OS major version.
+ matching the target OS major version.
:param pesid: The PES ID for which to retrieve PESIDRepositoryEntries.
:type pesid: str
diff --git a/repos/system_upgrade/common/actors/scanfilesfortargetuserspace/tests/test_scanfilesfortargetuserspace.py b/repos/system_upgrade/common/actors/scanfilesfortargetuserspace/tests/test_scanfilesfortargetuserspace.py
index dce0f534..afe1a443 100644
--- a/repos/system_upgrade/common/actors/scanfilesfortargetuserspace/tests/test_scanfilesfortargetuserspace.py
+++ b/repos/system_upgrade/common/actors/scanfilesfortargetuserspace/tests/test_scanfilesfortargetuserspace.py
@@ -58,7 +58,7 @@ def test_etc_hosts_present(monkeypatch, isfile_default_config):
preupgrade_task_msg = actor_produces.model_instances[0]
- fail_msg = 'Didn\'t indentify any files to copy into target userspace (at least /etc/hosts shoud be).'
+ fail_msg = 'Didn\'t identify any files to copy into target userspace (at least /etc/hosts should be).'
assert preupgrade_task_msg.copy_files, fail_msg
should_copy_hostsfile = do_files_to_copy_contain_entry_with_src(preupgrade_task_msg.copy_files, '/etc/hosts')
@@ -70,7 +70,7 @@ def test_etc_hosts_present(monkeypatch, isfile_default_config):
def test_etc_hosts_missing(monkeypatch, isfile_default_config):
"""Tests whether /etc/hosts is not identified as "to be copied" into target userspace when it is missing."""
- isfile_default_config['/etc/hosts'] = False # The file is not present or is a directory (-> shoud not be copied)
+ isfile_default_config['/etc/hosts'] = False # The file is not present or is a directory (-> should not be copied)
mocked_isfile = make_mocked_isfile(isfile_default_config)
actor_produces = produce_mocked()
diff --git a/repos/system_upgrade/common/actors/scansaphana/libraries/scansaphana.py b/repos/system_upgrade/common/actors/scansaphana/libraries/scansaphana.py
index 1eec7a66..04195b57 100644
--- a/repos/system_upgrade/common/actors/scansaphana/libraries/scansaphana.py
+++ b/repos/system_upgrade/common/actors/scansaphana/libraries/scansaphana.py
@@ -113,7 +113,7 @@ def get_instance_status(instance_number, sapcontrol_path, admin_name):
# GetProcessList has some oddities, like returning non zero exit codes with special meanings.
# Exit code 3 = All processes are running correctly
# Exit code 4 = All processes stopped
- # Other exit codes aren't handled at this time and it's assumed that SAP HANA is possibly in some unusal
+ # Other exit codes aren't handled at this time and it's assumed that SAP HANA is possibly in some unusual
# state. Such as starting/stopping but also that it is in some kind of failure state.
output = run([
'sudo', '-u', admin_name, sapcontrol_path, '-nr', instance_number, '-function', 'GetProcessList'],
diff --git a/repos/system_upgrade/common/actors/scansubscriptionmanagerinfo/actor.py b/repos/system_upgrade/common/actors/scansubscriptionmanagerinfo/actor.py
index eb190085..50a7cd0f 100644
--- a/repos/system_upgrade/common/actors/scansubscriptionmanagerinfo/actor.py
+++ b/repos/system_upgrade/common/actors/scansubscriptionmanagerinfo/actor.py
@@ -9,7 +9,7 @@ class ScanSubscriptionManagerInfo(Actor):
Scans the current system for subscription manager information
Retrieves information about enabled and available repositories, attached SKUs, product certificates and release
- from the current system without modfying it.
+ from the current system without modifying it.
"""
name = 'scan_subscription_manager_info'
diff --git a/repos/system_upgrade/common/actors/selinux/selinuxapplycustom/actor.py b/repos/system_upgrade/common/actors/selinux/selinuxapplycustom/actor.py
index 17e8cb58..52502e96 100644
--- a/repos/system_upgrade/common/actors/selinux/selinuxapplycustom/actor.py
+++ b/repos/system_upgrade/common/actors/selinux/selinuxapplycustom/actor.py
@@ -17,7 +17,7 @@ class SELinuxApplyCustom(Actor):
Re-apply SELinux customizations from the original RHEL installation
Re-apply SELinux policy customizations (custom policy modules and changes
- introduced by semanage). Any changes (due to incompatiblity with
+ introduced by semanage). Any changes (due to incompatibility with
SELinux policy in the upgraded system) are reported to user.
"""
name = 'selinuxapplycustom'
diff --git a/repos/system_upgrade/common/actors/selinux/selinuxcontentscanner/libraries/selinuxcontentscanner.py b/repos/system_upgrade/common/actors/selinux/selinuxcontentscanner/libraries/selinuxcontentscanner.py
index ee162091..8f5e31ab 100644
--- a/repos/system_upgrade/common/actors/selinux/selinuxcontentscanner/libraries/selinuxcontentscanner.py
+++ b/repos/system_upgrade/common/actors/selinux/selinuxcontentscanner/libraries/selinuxcontentscanner.py
@@ -125,7 +125,7 @@ def get_selinux_modules():
return ([], [], [])
for (name, priority) in modules:
- # Udica templates should not be transfered, we only need a list of their
+ # Udica templates should not be transferred, we only need a list of their
# names and priorities so that we can reinstall their latest verisions
if name in UDICA_TEMPLATES:
template_list.append(
diff --git a/repos/system_upgrade/common/actors/setuptargetrepos/actor.py b/repos/system_upgrade/common/actors/setuptargetrepos/actor.py
index 00de0739..47724f0d 100644
--- a/repos/system_upgrade/common/actors/setuptargetrepos/actor.py
+++ b/repos/system_upgrade/common/actors/setuptargetrepos/actor.py
@@ -19,7 +19,7 @@ class SetupTargetRepos(Actor):
Produces list of repositories that should be available to be used by Upgrade process.
Based on current set of Red Hat Enterprise Linux repositories, produces the list of target
- repositories. Additionaly process request to use custom repositories during the upgrade
+ repositories. Additionally process request to use custom repositories during the upgrade
transaction.
"""
diff --git a/repos/system_upgrade/common/actors/setuptargetrepos/libraries/setuptargetrepos_repomap.py b/repos/system_upgrade/common/actors/setuptargetrepos/libraries/setuptargetrepos_repomap.py
index 567e8475..95147782 100644
--- a/repos/system_upgrade/common/actors/setuptargetrepos/libraries/setuptargetrepos_repomap.py
+++ b/repos/system_upgrade/common/actors/setuptargetrepos/libraries/setuptargetrepos_repomap.py
@@ -155,7 +155,7 @@ class RepoMapDataHandler(object):
def get_source_pesid_repos(self, pesid):
"""
Return the list of PESIDRepositoryEntry objects for a specified PES ID
- mathing the source OS major version.
+ matching the source OS major version.
:param pesid: The PES ID for which to retrieve PESIDRepositoryEntries.
:type pesid: str
@@ -168,7 +168,7 @@ class RepoMapDataHandler(object):
def get_target_pesid_repos(self, pesid):
"""
Return the list of PESIDRepositoryEntry objects for a specified PES ID
- mathing the target OS major version.
+ matching the target OS major version.
:param pesid: The PES ID for which to retrieve PESIDRepositoryEntries.
:type pesid: str
diff --git a/repos/system_upgrade/common/actors/setuptargetrepos/tests/test_repomapping.py b/repos/system_upgrade/common/actors/setuptargetrepos/tests/test_repomapping.py
index 19c41e19..4bda9397 100644
--- a/repos/system_upgrade/common/actors/setuptargetrepos/tests/test_repomapping.py
+++ b/repos/system_upgrade/common/actors/setuptargetrepos/tests/test_repomapping.py
@@ -185,7 +185,7 @@ def test_get_target_pesid_repos(monkeypatch, repomap_data_for_pesid_repo_retriev
assert actual_pesid_repo in expected_pesid_repos, fail_description
fail_description = (
- 'The get_target_pesid_repos method doesn\'t take into account the taget system version correctly.'
+ 'The get_target_pesid_repos method doesn\'t take into account the target system version correctly.'
)
monkeypatch.setattr(api, 'current_actor',
CurrentActorMocked(arch='x86_64', src_ver='9.4', dst_ver='10.0'))
@@ -244,7 +244,7 @@ def test_find_repository_target_equivalent_fallback_to_default(monkeypatch,
"""
Test for the RepoMapDataHandler._find_repository_target_equivalent method.
- Verifies that the method will find a target equivalent with matchin some of the fallback
+ Verifies that the method will find a target equivalent with matching some of the fallback
channels if a target equivalent that matches the source pesid repository completely is not
available in the repository mapping data.
"""
@@ -591,7 +591,7 @@ def test_find_repository_equivalent_with_priority_channel(monkeypatch):
assert handler.prio_channel == 'eus'
- fail_description = '_find_repository_target_equivalent does not correcly respect preferred channel.'
+ fail_description = '_find_repository_target_equivalent does not correctly respect preferred channel.'
expected_target_equivalent = repositories_mapping.repositories[2]
actual_target_equivalent = handler._find_repository_target_equivalent(repositories_mapping.repositories[0],
'pesid2')
@@ -624,7 +624,7 @@ def test_get_expected_target_pesid_repos_with_priority_channel_set(monkeypatch):
handler.set_default_channels(['tuv', 'ga'])
target_repoids = handler.get_expected_target_pesid_repos(['pesid1-repoid-ga'])
- fail_description = 'get_expected_target_peid_repos does not correcly respect preferred channel.'
+ fail_description = 'get_expected_target_peid_repos does not correctly respect preferred channel.'
assert {'pesid2': repositories_mapping.repositories[2],
'pesid3': repositories_mapping.repositories[4]} == target_repoids, fail_description
diff --git a/repos/system_upgrade/common/actors/systemfacts/libraries/systemfacts.py b/repos/system_upgrade/common/actors/systemfacts/libraries/systemfacts.py
index 26e654ae..e34cb86b 100644
--- a/repos/system_upgrade/common/actors/systemfacts/libraries/systemfacts.py
+++ b/repos/system_upgrade/common/actors/systemfacts/libraries/systemfacts.py
@@ -113,7 +113,7 @@ def _get_active_kernel_modules(logger):
signature_string = None
if signature:
- # Remove whitspace from the signature string
+ # Remove whitespace from the signature string
signature_string = re.sub(r"\s+", "", signature, flags=re.UNICODE)
# Since we're using the `/sys` VFS we need to use `os.listdir()` to get
@@ -274,7 +274,7 @@ def _default_grub_info():
reporting.Title('File "{}" does not exist!'.format(default_grb_fpath)),
reporting.Summary(
'Leapp detected "{}" does not exist. The file is essential for the in-place upgrade '
- 'to finish successfully. This scenario might have occured if the system was already '
+ 'to finish successfully. This scenario might have occurred if the system was already '
'upgraded from RHEL 6. Please re-create the file manually.'.format(default_grb_fpath)
),
reporting.Severity(reporting.Severity.HIGH),
diff --git a/repos/system_upgrade/common/actors/targetuserspacecreator/libraries/userspacegen.py b/repos/system_upgrade/common/actors/targetuserspacecreator/libraries/userspacegen.py
index ee1aa8fb..c39af66f 100644
--- a/repos/system_upgrade/common/actors/targetuserspacecreator/libraries/userspacegen.py
+++ b/repos/system_upgrade/common/actors/targetuserspacecreator/libraries/userspacegen.py
@@ -30,7 +30,7 @@ from leapp.utils.deprecation import suppress_deprecation
# # (0.) consume process input data
# # 1. prepare the first container, to be able to obtain repositories for the
# # target system (this is extra neededwhen rhsm is used, but not reason to
-# # do such thing only when rhsm is used. Be persistant here
+# # do such thing only when rhsm is used. Be persistent here
# # 2. gather target repositories that should AND can be used
# # - basically here is the main thing that is PITA; I started
# # the refactoring but realized that it needs much more changes because
@@ -60,7 +60,7 @@ def _check_deprecated_rhsm_skip():
if get_env('LEAPP_DEVEL_SKIP_RHSM', '0') == '1':
api.current_logger().warning(
'The LEAPP_DEVEL_SKIP_RHSM has been deprecated. Use'
- ' LEAPP_NO_RHSM istead or use the --no-rhsm option for'
+ ' LEAPP_NO_RHSM instead or use the --no-rhsm option for'
' leapp. as well custom repofile has not been defined.'
' Please read documentation about new "skip rhsm" solution.'
)
@@ -510,7 +510,7 @@ def gather_target_repositories(context, indata):
else:
# TODO: We shall report that the RHEL repos that we deem necessary for
# the upgrade are not available; but currently it would just print bunch of
- # data everytime as we maps EUS and other repositories as well. But these
+ # data every time as we maps EUS and other repositories as well. But these
# do not have to be necessary available on the target system in the time
# of the upgrade. Let's skip it for now until it's clear how we will deal
# with it.
@@ -582,7 +582,7 @@ def _install_custom_repofiles(context, custom_repofiles):
"""
Install the required custom repository files into the container.
- The repostory files are copied from the host into the /etc/yum.repos.d
+ The repository files are copied from the host into the /etc/yum.repos.d
directory into the container.
:param context: the container where the repofiles should be copied
diff --git a/repos/system_upgrade/common/actors/targetuserspacecreator/tests/unit_test_targetuserspacecreator.py b/repos/system_upgrade/common/actors/targetuserspacecreator/tests/unit_test_targetuserspacecreator.py
index 425f3062..276175a1 100644
--- a/repos/system_upgrade/common/actors/targetuserspacecreator/tests/unit_test_targetuserspacecreator.py
+++ b/repos/system_upgrade/common/actors/targetuserspacecreator/tests/unit_test_targetuserspacecreator.py
@@ -373,5 +373,5 @@ def test_perform_ok(monkeypatch):
assert userspacegen.api.produce.called == 3
assert isinstance(userspacegen.api.produce.model_instances[0], models.TMPTargetRepositoriesFacts)
assert userspacegen.api.produce.model_instances[1] == msg_target_repos
- # this one is full of contants, so it's safe to check just the instance
+ # this one is full of constants, so it's safe to check just the instance
assert isinstance(userspacegen.api.produce.model_instances[2], models.TargetUserSpaceInfo)
diff --git a/repos/system_upgrade/common/actors/unsupportedupgradecheck/actor.py b/repos/system_upgrade/common/actors/unsupportedupgradecheck/actor.py
index fd1b1ef6..e8b3499a 100644
--- a/repos/system_upgrade/common/actors/unsupportedupgradecheck/actor.py
+++ b/repos/system_upgrade/common/actors/unsupportedupgradecheck/actor.py
@@ -6,7 +6,7 @@ from leapp.tags import ChecksPhaseTag, IPUWorkflowTag
class UnsupportedUpgradeCheck(Actor):
"""
- Checks enviroment variables and produces a warning report if the upgrade is unsupported.
+ Checks environment variables and produces a warning report if the upgrade is unsupported.
Upgrade is unsupported if any LEAPP_DEVEL_* variable is used or an experimental actor is enabled.
This can be overridden by setting the variable LEAPP_UNSUPPORTED (at user's own risk).
diff --git a/repos/system_upgrade/common/actors/updategrubcore/tests/test_updategrubcore.py b/repos/system_upgrade/common/actors/updategrubcore/tests/test_updategrubcore.py
index afeff4a4..c72a5f4a 100644
--- a/repos/system_upgrade/common/actors/updategrubcore/tests/test_updategrubcore.py
+++ b/repos/system_upgrade/common/actors/updategrubcore/tests/test_updategrubcore.py
@@ -14,7 +14,7 @@ UPDATE_FAILED_TITLE = 'GRUB core update failed'
def raise_call_error(args=None):
raise CalledProcessError(
- message='A Leapp Command Error occured.',
+ message='A Leapp Command Error occurred.',
command=args,
result={'signal': None, 'exit_code': 1, 'pid': 0, 'stdout': 'fake', 'stderr': 'fake'}
)
diff --git a/repos/system_upgrade/common/files/rhel_upgrade.py b/repos/system_upgrade/common/files/rhel_upgrade.py
index 6d6ad752..62a92989 100644
--- a/repos/system_upgrade/common/files/rhel_upgrade.py
+++ b/repos/system_upgrade/common/files/rhel_upgrade.py
@@ -143,7 +143,7 @@ class RhelUpgradeCommand(dnf.cli.Command):
# folder in "/var/cache/dnf" as it has different digest calculated based on already substituted
# placeholder.
# E.g
- # "https://rhui3.REGION.aws.ce.redhat.com" becames "https://rhui3.eu-central-1.aws.ce.redhat.com"
+ # "https://rhui3.REGION.aws.ce.redhat.com" becomes "https://rhui3.eu-central-1.aws.ce.redhat.com"
#
# region should be same for all repos so we are fine to collect it from
# the last one
diff --git a/repos/system_upgrade/common/libraries/config/__init__.py b/repos/system_upgrade/common/libraries/config/__init__.py
index 8835a568..5c8f2efb 100644
--- a/repos/system_upgrade/common/libraries/config/__init__.py
+++ b/repos/system_upgrade/common/libraries/config/__init__.py
@@ -63,7 +63,7 @@ def get_target_product_channel(default='ga'):
- Using the environment variable LEAPP_DEVEL_TARGET_PRODUCT_TYPE (devel variable with higher priority than
any other way of specifying target channel).
- Using the environment variable LEAPP_TARGET_PRODUCT_CHANNEL
- - Using the '--channel' option when runnning leapp preupgrade/upgrade
+ - Using the '--channel' option when running leapp preupgrade/upgrade
:param default: Value to be returned if no target product type has been specified when running leapp.
:type default: str
diff --git a/repos/system_upgrade/common/libraries/dnfconfig.py b/repos/system_upgrade/common/libraries/dnfconfig.py
index 49bf8009..64d6c204 100644
--- a/repos/system_upgrade/common/libraries/dnfconfig.py
+++ b/repos/system_upgrade/common/libraries/dnfconfig.py
@@ -12,7 +12,7 @@ def get_leapp_packages():
installed.
The snactor RPM doesn't have to be installed, but if so, we have to take
- care about that too as well to preven broken dnf transaction.
+ care about that too as well to prevent broken dnf transaction.
"""
# TODO: should we set the seatbelt and exclude leapp RPMs from the target
# system too?
diff --git a/repos/system_upgrade/common/libraries/dnfplugin.py b/repos/system_upgrade/common/libraries/dnfplugin.py
index 4010e9f3..56b703d5 100644
--- a/repos/system_upgrade/common/libraries/dnfplugin.py
+++ b/repos/system_upgrade/common/libraries/dnfplugin.py
@@ -244,7 +244,7 @@ def apply_workarounds(context=None):
context.call(['/bin/bash', '-c', workaround.script_path])
except (OSError, CalledProcessError) as e:
raise StopActorExecutionError(
- message=('Failed to exceute script to apply transaction workaround {display_name}.'
+ message=('Failed to execute script to apply transaction workaround {display_name}.'
' Message: {error}'.format(error=str(e), display_name=workaround.display_name))
)
@@ -336,7 +336,7 @@ def perform_transaction_install(target_userspace_info, storage_info, used_repos,
)
# we have to ensure the leapp packages will stay untouched even after the
- # upgrade is fully finished (it cannot be done before the upgarde
+ # upgrade is fully finished (it cannot be done before the upgrade
# on the host as the config-manager plugin is available since rhel-8)
dnfconfig.exclude_leapp_rpms(mounting.NotIsolatedActions(base_dir='/'))
diff --git a/repos/system_upgrade/common/libraries/guards.py b/repos/system_upgrade/common/libraries/guards.py
index 763483aa..c8001817 100644
--- a/repos/system_upgrade/common/libraries/guards.py
+++ b/repos/system_upgrade/common/libraries/guards.py
@@ -38,7 +38,7 @@ def connection_guard(url='https://example.com'):
return None
except URLError as e:
cause = '''Failed to open url '{url}' with error: {error}'''.format(url=url, error=e)
- return ('There was probably a problem with internet conection ({cause}).'
+ return ('There was probably a problem with internet connection ({cause}).'
' Check your connection and try again.'.format(cause=cause))
return closure
diff --git a/repos/system_upgrade/common/libraries/mounting.py b/repos/system_upgrade/common/libraries/mounting.py
index d12344c2..f272d8c7 100644
--- a/repos/system_upgrade/common/libraries/mounting.py
+++ b/repos/system_upgrade/common/libraries/mounting.py
@@ -10,7 +10,7 @@ from leapp.libraries.stdlib import api, CalledProcessError, run
# Using ALWAYS_BIND will crash the upgrade process if the file does not exist.
# Consider instead adding an entry to the ScanFilesToCopyIntoTargetSystem actor that
-# conditionaly (only if it exists) creates CopyFile message to the TargetUserspaceCreator.
+# conditionally (only if it exists) creates CopyFile message to the TargetUserspaceCreator.
ALWAYS_BIND = []
ErrorData = namedtuple('ErrorData', ['summary', 'details'])
diff --git a/repos/system_upgrade/common/libraries/overlaygen.py b/repos/system_upgrade/common/libraries/overlaygen.py
index 43695c7d..b544f88c 100644
--- a/repos/system_upgrade/common/libraries/overlaygen.py
+++ b/repos/system_upgrade/common/libraries/overlaygen.py
@@ -55,7 +55,7 @@ def _prepare_required_mounts(scratch_dir, mounts_dir, mount_points, xfs_info):
space_needed = _overlay_disk_size() * len(xfs_info.mountpoints_without_ftype)
disk_images_directory = os.path.join(scratch_dir, 'diskimages')
- # Ensure we cleanup old disk images before we check for space contraints.
+ # Ensure we cleanup old disk images before we check for space constraints.
run(['rm', '-rf', disk_images_directory])
_create_diskimages_dir(scratch_dir, disk_images_directory)
_ensure_enough_diskimage_space(space_needed, scratch_dir)
diff --git a/repos/system_upgrade/common/libraries/tests/test_grub.py b/repos/system_upgrade/common/libraries/tests/test_grub.py
index 1775790e..ba086854 100644
--- a/repos/system_upgrade/common/libraries/tests/test_grub.py
+++ b/repos/system_upgrade/common/libraries/tests/test_grub.py
@@ -19,7 +19,7 @@ CUR_DIR = os.path.dirname(os.path.abspath(__file__))
def raise_call_error(args=None):
raise CalledProcessError(
- message='A Leapp Command Error occured.',
+ message='A Leapp Command Error occurred.',
command=args,
result={'signal': None, 'exit_code': 1, 'pid': 0, 'stdout': 'fake', 'stderr': 'fake'}
)
diff --git a/repos/system_upgrade/common/libraries/tests/test_rhsm.py b/repos/system_upgrade/common/libraries/tests/test_rhsm.py
index 193bbcc8..a6dbea96 100644
--- a/repos/system_upgrade/common/libraries/tests/test_rhsm.py
+++ b/repos/system_upgrade/common/libraries/tests/test_rhsm.py
@@ -244,7 +244,7 @@ def test_get_release(monkeypatch, actor_mocked, context_mocked):
def test_get_release_with_release_not_set(monkeypatch, actor_mocked, context_mocked):
"""Tests whether the library does not retrieve release information when the release is not set."""
- # Test whether no realease is detected correctly too
+ # Test whether no release is detected correctly too
context_mocked.add_mocked_command_call_with_stdout(CMD_RHSM_RELEASE, 'Release not set')
release = rhsm.get_release(context_mocked)
diff --git a/repos/system_upgrade/common/libraries/utils.py b/repos/system_upgrade/common/libraries/utils.py
index 6793de63..943a6e0b 100644
--- a/repos/system_upgrade/common/libraries/utils.py
+++ b/repos/system_upgrade/common/libraries/utils.py
@@ -49,7 +49,7 @@ def makedirs(path, mode=0o777, exists_ok=True):
@deprecated(since='2022-02-03', message=(
'The "apply_yum_workaround" function has been deprecated, use "DNFWorkaround" '
- 'message as used in the successing "RegisterYumAdjustment" actor.'
+ 'message as used in the successive "RegisterYumAdjustment" actor.'
)
)
def apply_yum_workaround(context=None):
@@ -69,7 +69,7 @@ def apply_yum_workaround(context=None):
context.call(cmd)
except OSError as e:
raise StopActorExecutionError(
- message='Failed to exceute script to apply yum adjustment. Message: {}'.format(str(e))
+ message='Failed to execute script to apply yum adjustment. Message: {}'.format(str(e))
)
except CalledProcessError as e:
raise StopActorExecutionError(
@@ -160,7 +160,7 @@ def clean_guard(cleanup_function):
try:
cleanup_function(*args, **kwargs)
except Exception: # pylint: disable=broad-except
- # Broad exception handler to handle all cases however, swallowed, to avoid loosing the original
+ # Broad exception handler to handle all cases however, swallowed, to avoid losing the original
# error. Logging for debuggability.
api.current_logger().warning('Caught and swallowed an exception during cleanup.', exc_info=True)
raise # rethrow original exception
diff --git a/repos/system_upgrade/common/models/cpuinfo.py b/repos/system_upgrade/common/models/cpuinfo.py
index 71f58b24..e3e52838 100644
--- a/repos/system_upgrade/common/models/cpuinfo.py
+++ b/repos/system_upgrade/common/models/cpuinfo.py
@@ -8,7 +8,7 @@ class CPUInfo(Model):
The model currently doesn't represent all information about cpus could
provide on the machine. Just part of them, in case any other attributes
- will be neded, the model can be extended.
+ will be needed, the model can be extended.
The provided info is aggregated - like from lscpu command. Expecting all
CPUs are same on the machine (at least for now).
diff --git a/repos/system_upgrade/common/models/dnfplugintask.py b/repos/system_upgrade/common/models/dnfplugintask.py
index 873e5d7d..74c084fd 100644
--- a/repos/system_upgrade/common/models/dnfplugintask.py
+++ b/repos/system_upgrade/common/models/dnfplugintask.py
@@ -4,7 +4,7 @@ from leapp.topics import SystemInfoTopic
class DNFPluginTask(Model):
"""
- Represents information what should DNF do with a specifiec DNF plugin
+ Represents information what should DNF do with a specific DNF plugin
in various stages.
Currently, it's possible just to disable specified DNF plugins.
diff --git a/repos/system_upgrade/common/models/initramfs.py b/repos/system_upgrade/common/models/initramfs.py
index 6c6bb999..a5d1416e 100644
--- a/repos/system_upgrade/common/models/initramfs.py
+++ b/repos/system_upgrade/common/models/initramfs.py
@@ -63,7 +63,7 @@ class UpgradeInitramfsTasks(Model):
include_files = fields.List(fields.String(), default=[])
"""
- List of files (cannonical filesystem paths) to include in the initramfs
+ List of files (canonical filesystem paths) to include in the initramfs
"""
include_dracut_modules = fields.List(fields.Model(DracutModule), default=[])
@@ -91,7 +91,7 @@ class TargetInitramfsTasks(UpgradeInitramfsTasks):
@deprecated(since='2021-10-10', message='Replaced by TargetInitramfsTasks.')
class InitrdIncludes(Model):
"""
- List of files (cannonical filesystem paths) to include in RHEL-8 initramfs
+ List of files (canonical filesystem paths) to include in RHEL-8 initramfs
"""
topic = SystemInfoTopic
diff --git a/repos/system_upgrade/common/models/installeddesktopsfacts.py b/repos/system_upgrade/common/models/installeddesktopsfacts.py
index 2dfc6c1c..87b0ca9f 100644
--- a/repos/system_upgrade/common/models/installeddesktopsfacts.py
+++ b/repos/system_upgrade/common/models/installeddesktopsfacts.py
@@ -4,7 +4,7 @@ from leapp.topics import SystemFactsTopic
class InstalledDesktopsFacts(Model):
"""
- The model includes fact about installe
+ The model includes fact about installed
"""
topic = SystemFactsTopic
gnome_installed = fields.Boolean(default=False)
diff --git a/repos/system_upgrade/common/models/module.py b/repos/system_upgrade/common/models/module.py
index 781a9b30..688c43cf 100644
--- a/repos/system_upgrade/common/models/module.py
+++ b/repos/system_upgrade/common/models/module.py
@@ -4,7 +4,7 @@ from leapp.topics import SystemFactsTopic
class Module(Model):
"""
- A single DNF module indentified by its name and stream.
+ A single DNF module identified by its name and stream.
"""
topic = SystemFactsTopic
name = fields.String()
diff --git a/repos/system_upgrade/common/models/opensshconfig.py b/repos/system_upgrade/common/models/opensshconfig.py
index e94c6881..f4dc3261 100644
--- a/repos/system_upgrade/common/models/opensshconfig.py
+++ b/repos/system_upgrade/common/models/opensshconfig.py
@@ -9,7 +9,7 @@ class OpenSshPermitRootLogin(Model):
'forced-commands-only', 'no'])
""" Value of a PermitRootLogin directive. """
in_match = fields.Nullable(fields.List(fields.String()))
- """ Criteria of Match blocks the PermitRootLogin directive occured in, if any. """
+ """ Criteria of Match blocks the PermitRootLogin directive occurred in, if any. """
class OpenSshConfig(Model):
diff --git a/repos/system_upgrade/common/models/targetuserspace.py b/repos/system_upgrade/common/models/targetuserspace.py
index d6d03bab..4b5d4bd7 100644
--- a/repos/system_upgrade/common/models/targetuserspace.py
+++ b/repos/system_upgrade/common/models/targetuserspace.py
@@ -54,7 +54,7 @@ class CopyFile(Model):
src = fields.String()
"""
- Cannonical path to the file (on the host) that should be copied
+ Canonical path to the file (on the host) that should be copied
"""
dst = fields.Nullable(fields.String())
diff --git a/repos/system_upgrade/common/workflows/inplace_upgrade.py b/repos/system_upgrade/common/workflows/inplace_upgrade.py
index eb2313a4..d4871aa3 100644
--- a/repos/system_upgrade/common/workflows/inplace_upgrade.py
+++ b/repos/system_upgrade/common/workflows/inplace_upgrade.py
@@ -50,7 +50,7 @@ class IPUWorkflow(Workflow):
Get information about target system. Analogy of FactsCollectionPhase for target system.
Here we can collect information what repositories are available on target system,
- what is expected calculation of target transaction (what will be instaled, removed, ...
+ what is expected calculation of target transaction (what will be installed, removed, ...
"""
name = 'TargetTransactionFactsCollection'
@@ -176,7 +176,7 @@ class IPUWorkflow(Workflow):
class ApplicationsPhase(Phase):
"""
- Perform the neccessary steps to finish upgrade of applications provided by Red Hat.
+ Perform the necessary steps to finish upgrade of applications provided by Red Hat.
This may include moving/renaming of configuration files, modifying configuration of applications to be able
to run correctly and with as similar behaviour to the original as possible.
diff --git a/repos/system_upgrade/el7toel8/actors/bindupdate/actor.py b/repos/system_upgrade/el7toel8/actors/bindupdate/actor.py
index 6e94b8c8..d612ffb9 100644
--- a/repos/system_upgrade/el7toel8/actors/bindupdate/actor.py
+++ b/repos/system_upgrade/el7toel8/actors/bindupdate/actor.py
@@ -7,7 +7,7 @@ from leapp.tags import IPUWorkflowTag, PreparationPhaseTag
class BindUpdate(Actor):
"""
- Actor parsing facts found in configuration and modifing configuration.
+ Actor parsing facts found in configuration and modifying configuration.
"""
name = 'bind_update'
diff --git a/repos/system_upgrade/el7toel8/actors/bindupdate/libraries/updates.py b/repos/system_upgrade/el7toel8/actors/bindupdate/libraries/updates.py
index 9d7b9a36..aa0aeeb8 100644
--- a/repos/system_upgrade/el7toel8/actors/bindupdate/libraries/updates.py
+++ b/repos/system_upgrade/el7toel8/actors/bindupdate/libraries/updates.py
@@ -44,7 +44,7 @@ def update_section(parser, section):
def update_config(parser, cfg):
- """Modify contents of file accoriding to rules.
+ """Modify contents of file according to rules.
:type cfg: ConfigFile
:returns str: Modified config contents
diff --git a/repos/system_upgrade/el7toel8/actors/checkremovedpammodules/actor.py b/repos/system_upgrade/el7toel8/actors/checkremovedpammodules/actor.py
index 9572d694..503f6149 100644
--- a/repos/system_upgrade/el7toel8/actors/checkremovedpammodules/actor.py
+++ b/repos/system_upgrade/el7toel8/actors/checkremovedpammodules/actor.py
@@ -12,7 +12,7 @@ class CheckRemovedPamModules(Actor):
Check for modules that are not available in RHEL 8 anymore
At this moment, we check only for pam_tally2. Few more modules
- are alredy covered in RemoveOldPAMModulesApply actor
+ are already covered in RemoveOldPAMModulesApply actor
"""
name = 'removed_pam_modules'
@@ -30,7 +30,7 @@ class CheckRemovedPamModules(Actor):
'Could not check pam configuration', details={'details': 'No PamConfiguration facts found.'}
)
- # This list contain tupples of removed modules and their recommended replacements
+ # This list contain tuples of removed modules and their recommended replacements
removed_modules = [
('pam_tally2', 'pam_faillock'),
]
diff --git a/repos/system_upgrade/el7toel8/actors/checksaphana/libraries/checksaphana.py b/repos/system_upgrade/el7toel8/actors/checksaphana/libraries/checksaphana.py
index b028b5af..e540ccd1 100644
--- a/repos/system_upgrade/el7toel8/actors/checksaphana/libraries/checksaphana.py
+++ b/repos/system_upgrade/el7toel8/actors/checksaphana/libraries/checksaphana.py
@@ -133,7 +133,7 @@ def _sp_rev_patchlevel_check(instance):
def _fullfills_hana_min_version(instance):
- """ Performs a check whether the version of SAP HANA fullfills the minimal requirements for the target RHEL """
+ """ Performs a check whether the version of SAP HANA fulfills the minimal requirements for the target RHEL """
return _major_version_check(instance) and _sp_rev_patchlevel_check(instance)
diff --git a/repos/system_upgrade/el7toel8/actors/cupscheck/libraries/cupscheck.py b/repos/system_upgrade/el7toel8/actors/cupscheck/libraries/cupscheck.py
index 424503a0..0f990959 100644
--- a/repos/system_upgrade/el7toel8/actors/cupscheck/libraries/cupscheck.py
+++ b/repos/system_upgrade/el7toel8/actors/cupscheck/libraries/cupscheck.py
@@ -135,10 +135,10 @@ def check_certkey_directives(facts, report_func):
:param obj facts: model object containing info about CUPS configuration
:param func report_func: creates report
"""
- title = ('ServerKey/ServerCertificate directives are substitued '
+ title = ('ServerKey/ServerCertificate directives are substituted '
'by ServerKeychain directive')
summary = (
- 'The directives were substitued by ServerKeychain directive, '
+ 'The directives were substituted by ServerKeychain directive, '
'which now takes a directory as value (/etc/cups/ssl is default). '
'The previous directives took a file as value. '
'The migration script will copy the files specified in '
diff --git a/repos/system_upgrade/el7toel8/actors/grubdevname/tests/test_grubdevname.py b/repos/system_upgrade/el7toel8/actors/grubdevname/tests/test_grubdevname.py
index 07d2c31a..f26a135d 100644
--- a/repos/system_upgrade/el7toel8/actors/grubdevname/tests/test_grubdevname.py
+++ b/repos/system_upgrade/el7toel8/actors/grubdevname/tests/test_grubdevname.py
@@ -20,7 +20,7 @@ CUR_DIR = os.path.dirname(os.path.abspath(__file__))
def raise_call_error(args=None):
raise CalledProcessError(
- message='A Leapp Command Error occured.',
+ message='A Leapp Command Error occurred.',
command=args,
result={'signal': None, 'exit_code': 1, 'pid': 0, 'stdout': 'fake', 'stderr': 'fake'}
)
diff --git a/repos/system_upgrade/el7toel8/actors/multipathconfread/actor.py b/repos/system_upgrade/el7toel8/actors/multipathconfread/actor.py
index 586c2c7a..da85414b 100644
--- a/repos/system_upgrade/el7toel8/actors/multipathconfread/actor.py
+++ b/repos/system_upgrade/el7toel8/actors/multipathconfread/actor.py
@@ -6,7 +6,7 @@ from leapp.tags import FactsPhaseTag, IPUWorkflowTag
class MultipathConfRead(Actor):
"""
- Read multipath configuration files and extract the necessary informaton
+ Read multipath configuration files and extract the necessary information
Related files:
- /etc/multipath.conf
diff --git a/repos/system_upgrade/el7toel8/actors/multipathconfupdate/actor.py b/repos/system_upgrade/el7toel8/actors/multipathconfupdate/actor.py
index fd20f909..221285e1 100644
--- a/repos/system_upgrade/el7toel8/actors/multipathconfupdate/actor.py
+++ b/repos/system_upgrade/el7toel8/actors/multipathconfupdate/actor.py
@@ -11,7 +11,7 @@ class MultipathConfUpdate(Actor):
1. commenting out lines for options that no longer exist, or whose value
is no longer current in RHEL-8
2. Migrating any options in an devices section with all_devs to an
- overrides setions
+ overrides sections
3. Rename options that have changed names
"""
diff --git a/repos/system_upgrade/el7toel8/actors/postgresqlcheck/tests/test_postgresqlcheck.py b/repos/system_upgrade/el7toel8/actors/postgresqlcheck/tests/test_postgresqlcheck.py
index 348f1bd1..658d3e4c 100644
--- a/repos/system_upgrade/el7toel8/actors/postgresqlcheck/tests/test_postgresqlcheck.py
+++ b/repos/system_upgrade/el7toel8/actors/postgresqlcheck/tests/test_postgresqlcheck.py
@@ -36,7 +36,7 @@ def test_actor_execution(monkeypatch, has_server, has_contrib):
Parametrized helper function for test_actor_* functions.
First generate list of RPM models based on set arguments. Then, run
- the actor feeded with our RPM list. Finally, assert Reports
+ the actor fed with our RPM list. Finally, assert Reports
according to set arguments.
Parameters:
@@ -59,7 +59,7 @@ def test_actor_execution(monkeypatch, has_server, has_contrib):
monkeypatch.setattr(api, 'current_actor', curr_actor_mocked)
monkeypatch.setattr(reporting, "create_report", create_report_mocked())
- # Executed actor feeded with out fake RPMs
+ # Executed actor fed with out fake RPMs
report_installed_packages(_context=api)
if has_server and has_contrib:
diff --git a/repos/system_upgrade/el7toel8/actors/quaggatofrr/libraries/quaggatofrr.py b/repos/system_upgrade/el7toel8/actors/quaggatofrr/libraries/quaggatofrr.py
index d05c6032..07bccf95 100644
--- a/repos/system_upgrade/el7toel8/actors/quaggatofrr/libraries/quaggatofrr.py
+++ b/repos/system_upgrade/el7toel8/actors/quaggatofrr/libraries/quaggatofrr.py
@@ -6,7 +6,7 @@ from leapp.libraries.common.config import version
from leapp.libraries.stdlib import api, CalledProcessError, run
DAEMON_FILE = '/etc/frr/daemons'
-# if this file sitll exists after the removal of quagga, it has been modified
+# if this file still exists after the removal of quagga, it has been modified
CONFIG_FILE = '/etc/sysconfig/quagga.rpmsave'
QUAGGA_CONF_FILES = '/etc/quagga/'
FRR_CONF_FILES = '/etc/frr/'
diff --git a/repos/system_upgrade/el7toel8/actors/quaggatofrr/tests/files/daemons b/repos/system_upgrade/el7toel8/actors/quaggatofrr/tests/files/daemons
index 9159e49d..6b5ccd4a 100644
--- a/repos/system_upgrade/el7toel8/actors/quaggatofrr/tests/files/daemons
+++ b/repos/system_upgrade/el7toel8/actors/quaggatofrr/tests/files/daemons
@@ -76,7 +76,7 @@ fabricd_options=("-A 127.0.0.1")
# If the vtysh_enable is yes, then the unified config is read
# and applied if it exists. If no unified frr.conf exists
# then the per-daemon <daemon>.conf files are used)
-# If vtysh_enable is no or non-existant, the frr.conf is ignored.
+# If vtysh_enable is no or non-existent, the frr.conf is ignored.
# it is highly suggested to have this set to yes
vtysh_enable=yes
diff --git a/repos/system_upgrade/el7toel8/actors/quaggatofrr/tests/test_unit_quaggatofrr.py b/repos/system_upgrade/el7toel8/actors/quaggatofrr/tests/test_unit_quaggatofrr.py
index 48b46dce..503dbfbc 100644
--- a/repos/system_upgrade/el7toel8/actors/quaggatofrr/tests/test_unit_quaggatofrr.py
+++ b/repos/system_upgrade/el7toel8/actors/quaggatofrr/tests/test_unit_quaggatofrr.py
@@ -92,7 +92,7 @@ class MockedOpen(object):
Get list of MockedFilePointer objects with the specified fname.
if the mode is set (expected 'r', 'rw', 'w' ..) discovered files are
- additionaly filtered to match the same mode (same string).
+ additionally filtered to match the same mode (same string).
"""
fnames = [i for i in self._open_called if i.fname == fname]
return fnames if not mode else [i for i in fnames if i.mode == mode]
diff --git a/repos/system_upgrade/el7toel8/actors/satellite_upgrade_facts/actor.py b/repos/system_upgrade/el7toel8/actors/satellite_upgrade_facts/actor.py
index ea2e340c..2bbceb5d 100644
--- a/repos/system_upgrade/el7toel8/actors/satellite_upgrade_facts/actor.py
+++ b/repos/system_upgrade/el7toel8/actors/satellite_upgrade_facts/actor.py
@@ -80,7 +80,7 @@ class SatelliteUpgradeFacts(Actor):
Handle migration of the PostgreSQL legacy-actions files.
RPM cannot handle replacement of directories by symlinks by default
without the %pretrans scriptlet. As PostgreSQL package is packaged wrong,
- we have to workround that by migration of the PostgreSQL files
+ we have to workaround that by migration of the PostgreSQL files
before the rpm transaction is processed.
"""
self.produce(
diff --git a/repos/system_upgrade/el7toel8/actors/sctpconfigread/libraries/sctplib.py b/repos/system_upgrade/el7toel8/actors/sctpconfigread/libraries/sctplib.py
index 0db90508..cc002166 100644
--- a/repos/system_upgrade/el7toel8/actors/sctpconfigread/libraries/sctplib.py
+++ b/repos/system_upgrade/el7toel8/actors/sctpconfigread/libraries/sctplib.py
@@ -88,7 +88,7 @@ def was_sctp_used():
def is_sctp_wanted():
"""
- Decision making funtion that decides based on the current or past usage of SCTP, the SCTP module is wanted
+ Decision making function that decides based on the current or past usage of SCTP, the SCTP module is wanted
on the new system.
:return: True if SCTP seems to be in use or has been recently used.
diff --git a/repos/system_upgrade/el7toel8/actors/spamassassinconfigcheck/libraries/spamassassinconfigcheck.py b/repos/system_upgrade/el7toel8/actors/spamassassinconfigcheck/libraries/spamassassinconfigcheck.py
index 1399b7b6..3a4cf186 100644
--- a/repos/system_upgrade/el7toel8/actors/spamassassinconfigcheck/libraries/spamassassinconfigcheck.py
+++ b/repos/system_upgrade/el7toel8/actors/spamassassinconfigcheck/libraries/spamassassinconfigcheck.py
@@ -72,7 +72,7 @@ def _check_spamd_config_service_type(facts, report_func):
title = 'The type of the spamassassin systemd service has changed'
summary_generic = 'The type of spamassassin.service has been changed from "forking" to "simple".'
if facts.service_overriden:
- summary_detail = 'However, the service appears to be overriden; no migration action will occur.'
+ summary_detail = 'However, the service appears to be overridden; no migration action will occur.'
resource = reporting.RelatedResource('file', SPAMASSASSIN_SERVICE_OVERRIDE)
else:
summary_detail = 'The spamassassin sysconfig file will be updated.'
diff --git a/repos/system_upgrade/el7toel8/actors/spamassassinconfigcheck/tests/test_library_spamassassinconfigcheck.py b/repos/system_upgrade/el7toel8/actors/spamassassinconfigcheck/tests/test_library_spamassassinconfigcheck.py
index 97562c3e..a54dae21 100644
--- a/repos/system_upgrade/el7toel8/actors/spamassassinconfigcheck/tests/test_library_spamassassinconfigcheck.py
+++ b/repos/system_upgrade/el7toel8/actors/spamassassinconfigcheck/tests/test_library_spamassassinconfigcheck.py
@@ -119,7 +119,7 @@ def test_check_spamd_config_service_type_service_overriden():
report_fields = report_func.report_fields
assert 'type of the spamassassin systemd service' in report_fields['title']
assert 'The type of spamassassin.service' in report_fields['summary']
- assert 'overriden' in report_fields['summary']
+ assert 'overridden' in report_fields['summary']
assert report_fields['severity'] == 'medium'
diff --git a/repos/system_upgrade/el7toel8/actors/spamassassinconfigread/actor.py b/repos/system_upgrade/el7toel8/actors/spamassassinconfigread/actor.py
index 832cdde6..6b88968d 100644
--- a/repos/system_upgrade/el7toel8/actors/spamassassinconfigread/actor.py
+++ b/repos/system_upgrade/el7toel8/actors/spamassassinconfigread/actor.py
@@ -11,7 +11,7 @@ class SpamassassinConfigRead(Actor):
"""
Reads spamc configuration (/etc/mail/spamassassin/spamc.conf), the
spamassassin sysconfig file (/etc/sysconfig/spamassassin) and checks
- whether the spamassassin service has been overriden. Produces
+ whether the spamassassin service has been overridden. Produces
SpamassassinFacts containing the extracted information.
"""
diff --git a/repos/system_upgrade/el7toel8/actors/spamassassinconfigread/libraries/spamassassinconfigread.py b/repos/system_upgrade/el7toel8/actors/spamassassinconfigread/libraries/spamassassinconfigread.py
index 6cb86d4c..fde24f16 100644
--- a/repos/system_upgrade/el7toel8/actors/spamassassinconfigread/libraries/spamassassinconfigread.py
+++ b/repos/system_upgrade/el7toel8/actors/spamassassinconfigread/libraries/spamassassinconfigread.py
@@ -17,7 +17,7 @@ def is_processable():
def get_spamassassin_facts(read_func, listdir):
"""
Reads the spamc configuration file, the spamassassin sysconfig file and checks
- whether the spamassassin service is overriden. Returns SpamassassinFacts.
+ whether the spamassassin service is overridden. Returns SpamassassinFacts.
"""
spamc_ssl_argument = spamassassinconfigread_spamc.get_spamc_ssl_argument(read_func)
service_overriden = spamassassinconfigread_spamd.spamassassin_service_overriden(listdir)
diff --git a/repos/system_upgrade/el7toel8/actors/spamassassinconfigread/tests/test_lib_spamd_spamassassinconfigread.py b/repos/system_upgrade/el7toel8/actors/spamassassinconfigread/tests/test_lib_spamd_spamassassinconfigread.py
index a3b1f94f..8c2a9179 100644
--- a/repos/system_upgrade/el7toel8/actors/spamassassinconfigread/tests/test_lib_spamd_spamassassinconfigread.py
+++ b/repos/system_upgrade/el7toel8/actors/spamassassinconfigread/tests/test_lib_spamd_spamassassinconfigread.py
@@ -45,32 +45,32 @@ class MockListDir(object):
def test_spamassassin_service_overriden():
listdir = MockListDir(path='/etc/systemd/system', file_names=['spamassassin.service'])
- overriden = spamassassinconfigread_spamd.spamassassin_service_overriden(listdir.listdir)
- assert overriden is True
+ overridden = spamassassinconfigread_spamd.spamassassin_service_overriden(listdir.listdir)
+ assert overridden is True
listdir = MockListDir(path='/etc/systemd/system',
file_names=['foo.service', 'spamassassin.service', 'bar.service'])
- overriden = spamassassinconfigread_spamd.spamassassin_service_overriden(listdir.listdir)
- assert overriden is True
+ overridden = spamassassinconfigread_spamd.spamassassin_service_overriden(listdir.listdir)
+ assert overridden is True
assert not listdir.error
def test_spamassassin_service_overriden_nonexistent():
listdir = MockListDir(path='/etc/systemd/system', file_names=[])
- overriden = spamassassinconfigread_spamd.spamassassin_service_overriden(listdir.listdir)
- assert overriden is False
+ overridden = spamassassinconfigread_spamd.spamassassin_service_overriden(listdir.listdir)
+ assert overridden is False
listdir = MockListDir(path='/etc/systemd/system',
file_names=['foo.service', 'bar.service'])
- overriden = spamassassinconfigread_spamd.spamassassin_service_overriden(listdir.listdir)
- assert overriden is False
+ overridden = spamassassinconfigread_spamd.spamassassin_service_overriden(listdir.listdir)
+ assert overridden is False
assert not listdir.error
def test_spamassassin_service_overriden_nonexistent_dir():
listdir = MockListDir(to_raise=make_OSError(errno.ENOENT))
- overriden = spamassassinconfigread_spamd.spamassassin_service_overriden(listdir.listdir)
- assert overriden is False
+ overridden = spamassassinconfigread_spamd.spamassassin_service_overriden(listdir.listdir)
+ assert overridden is False
def test_spamassassin_service_overriden_nonexistent_inaccessible():
@@ -78,8 +78,8 @@ def test_spamassassin_service_overriden_nonexistent_inaccessible():
# so that the SpamassassinConfigUpdate actor doesn't make changes to
# /etc/sysconfig/spamassassin that may not be justified.
listdir = MockListDir(to_raise=make_OSError(errno.EACCES))
- overriden = spamassassinconfigread_spamd.spamassassin_service_overriden(listdir.listdir)
- assert overriden is True
+ overridden = spamassassinconfigread_spamd.spamassassin_service_overriden(listdir.listdir)
+ assert overridden is True
def test_parse_ssl_version_sslv3():
diff --git a/repos/system_upgrade/el7toel8/actors/spamassassinconfigupdate/tests/test_lib_spamd_spamassassinconfigupdate.py b/repos/system_upgrade/el7toel8/actors/spamassassinconfigupdate/tests/test_lib_spamd_spamassassinconfigupdate.py
index f8e14756..9acc4109 100644
--- a/repos/system_upgrade/el7toel8/actors/spamassassinconfigupdate/tests/test_lib_spamd_spamassassinconfigupdate.py
+++ b/repos/system_upgrade/el7toel8/actors/spamassassinconfigupdate/tests/test_lib_spamd_spamassassinconfigupdate.py
@@ -239,7 +239,7 @@ def test_rewrite_spamd_config():
def test_rewrite_spamd_config_service_overriden():
- # If the service is overriden, the service type (simple/forking) remains
+ # If the service is overridden, the service type (simple/forking) remains
# the same after upgrade. So we must not remove the -d option.
facts = SpamassassinFacts(spamd_ssl_version='sslv3', service_overriden=True)
content = '# Options to spamd\n' \
diff --git a/repos/system_upgrade/el7toel8/actors/tcpwrapperscheck/libraries/tcpwrapperscheck.py b/repos/system_upgrade/el7toel8/actors/tcpwrapperscheck/libraries/tcpwrapperscheck.py
index 5d98c428..5c3e93bb 100644
--- a/repos/system_upgrade/el7toel8/actors/tcpwrapperscheck/libraries/tcpwrapperscheck.py
+++ b/repos/system_upgrade/el7toel8/actors/tcpwrapperscheck/libraries/tcpwrapperscheck.py
@@ -8,17 +8,17 @@ def config_affects_daemons(tcp_wrappers_facts, packages_list, daemons):
:param tcp_wrappers_facts: Facts provided by the TcpWrappersFacts
:param packages_list: List of packages provided by InstalledRedHatSignedRPM
- :param deamons: List of packages and keywords affecting daemons in this format:
+ :param daemons: List of packages and keywords affecting daemons in this format:
[{"package-name", ["daemon1", "daemon2", ...], ...}]
"""
found_packages = set()
for (package, keywords) in daemons:
- # We do not care for particular deamon if the providing package is not installed
+ # We do not care for particular daemon if the providing package is not installed
if package not in packages_list:
continue
- # Every package can have several deamons or deamons reacting to several keywords
+ # Every package can have several daemons or daemons reacting to several keywords
for daemon in keywords:
# Is this daemon/keyword affected by the current configuration?
if not config_applies_to_daemon(tcp_wrappers_facts, daemon):
diff --git a/repos/system_upgrade/el7toel8/actors/ziplcheckbootentries/libraries/ziplcheckbootentries.py b/repos/system_upgrade/el7toel8/actors/ziplcheckbootentries/libraries/ziplcheckbootentries.py
index c9f93b79..757af6c8 100644
--- a/repos/system_upgrade/el7toel8/actors/ziplcheckbootentries/libraries/ziplcheckbootentries.py
+++ b/repos/system_upgrade/el7toel8/actors/ziplcheckbootentries/libraries/ziplcheckbootentries.py
@@ -58,7 +58,7 @@ def extract_kernel_version(kernel_img_path):
"""
Extracts the kernel version out of the given image path.
- The extraction logic is designed to closely mimick the logic Zipl configuration to BLS
+ The extraction logic is designed to closely mimic the logic Zipl configuration to BLS
conversion script works, so that it is possible to identify the possible issues with kernel
images.
@@ -67,7 +67,7 @@ def extract_kernel_version(kernel_img_path):
:rtype: str
"""
- # Mimick bash substitution used in the conversion script, see:
+ # Mimic bash substitution used in the conversion script, see:
# https://github.com/ibm-s390-linux/s390-tools/blob/b5604850ab66f862850568a37404faa647b5c098/scripts/zipl-switch-to-blscfg#L168
if 'vmlinuz-' in kernel_img_path:
fragments = kernel_img_path.rsplit('/vmlinuz-', 1)
diff --git a/repos/system_upgrade/el7toel8/actors/ziplconverttoblscfg/actor.py b/repos/system_upgrade/el7toel8/actors/ziplconverttoblscfg/actor.py
index dab0ae6c..e80c335d 100644
--- a/repos/system_upgrade/el7toel8/actors/ziplconverttoblscfg/actor.py
+++ b/repos/system_upgrade/el7toel8/actors/ziplconverttoblscfg/actor.py
@@ -73,5 +73,5 @@ class ZiplConvertToBLSCFG(Actor):
# NOTE: Basically, just removal of the /boot/loader dir content inside
# could be enough, but we cannot remove /boot/loader because of boom
# - - if we remove it, we will remove the snapshot as well
- # - - on the other hand, we should't keep it there if zipl
+ # - - on the other hand, we shouldn't keep it there if zipl
# - - has not been converted to BLS
diff --git a/repos/system_upgrade/el7toel8/libraries/isccfg.py b/repos/system_upgrade/el7toel8/libraries/isccfg.py
index 0a3f63fd..dff9bf24 100644
--- a/repos/system_upgrade/el7toel8/libraries/isccfg.py
+++ b/repos/system_upgrade/el7toel8/libraries/isccfg.py
@@ -51,7 +51,7 @@ class ConfigFile(object):
class MockConfig(ConfigFile):
- """Configuration file with contens defined on constructor.
+ """Configuration file with contents defined on constructor.
Intended for testing the library.
"""
@@ -501,7 +501,7 @@ class IscConfigParser(object):
choose the first one.
The function would be confusing in case of brackets, but content between
- brackets is not evaulated as new tokens.
+ brackets is not evaluated as new tokens.
E.g.:
"find { me };" : 5
@@ -630,7 +630,7 @@ class IscConfigParser(object):
:param index: start searching from the index
:param end_index: stop searching at the end_index or end of the string
- Funtion is not recursive. Searched key has to be in the current scope.
+ Function is not recursive. Searched key has to be in the current scope.
Attention:
In case that input string contains data outside of section by mistake,
diff --git a/repos/system_upgrade/el7toel8/libraries/vsftpdutils.py b/repos/system_upgrade/el7toel8/libraries/vsftpdutils.py
index c2d3b005..776c5b2d 100644
--- a/repos/system_upgrade/el7toel8/libraries/vsftpdutils.py
+++ b/repos/system_upgrade/el7toel8/libraries/vsftpdutils.py
@@ -25,7 +25,7 @@ def get_config_contents(path, read_func=read_file):
Try to read a vsftpd configuration file, log a warning if an error happens.
:param path: File path
- :param read_func: Function to use to read the file. This is meant to be overriden in tests.
+ :param read_func: Function to use to read the file. This is meant to be overridden in tests.
:return: File contents or None, if the file could not be read
"""
try:
@@ -40,7 +40,7 @@ def get_default_config_hash(read_func=read_file):
"""
Read the default vsftpd configuration file (/etc/vsftpd/vsftpd.conf) and return its hash.
- :param read_func: Function to use to read the file. This is meant to be overriden in tests.
+ :param read_func: Function to use to read the file. This is meant to be overridden in tests.
:return SHA1 hash of the configuration file, or None if the file could not be read.
"""
content = get_config_contents(VSFTPD_DEFAULT_CONFIG_PATH, read_func=read_func)
diff --git a/repos/system_upgrade/el7toel8/models/spamassassinfacts.py b/repos/system_upgrade/el7toel8/models/spamassassinfacts.py
index 6262295e..c0755aed 100644
--- a/repos/system_upgrade/el7toel8/models/spamassassinfacts.py
+++ b/repos/system_upgrade/el7toel8/models/spamassassinfacts.py
@@ -19,5 +19,5 @@ class SpamassassinFacts(Model):
service_overriden = fields.Boolean()
"""
- True if spamassassin.service is overriden, else False.
+ True if spamassassin.service is overridden, else False.
"""
diff --git a/repos/system_upgrade/el8toel9/actors/checkblsgrubcfgonppc64/actor.py b/repos/system_upgrade/el8toel9/actors/checkblsgrubcfgonppc64/actor.py
index d14e5aca..748ecd28 100644
--- a/repos/system_upgrade/el8toel9/actors/checkblsgrubcfgonppc64/actor.py
+++ b/repos/system_upgrade/el8toel9/actors/checkblsgrubcfgonppc64/actor.py
@@ -10,7 +10,7 @@ class CheckBlsGrubOnPpc64(Actor):
After a ppc64 system is upgraded from RHEL 8 to RHEL 9 and
GRUB config on RHEL 8 is not yet BLS aware, the system boots
- into el8 kernel because the config is not successfuly migrated by
+ into el8 kernel because the config is not successfully migrated by
GRUB during the upgrade process.
IMPORTANT NOTE: The later fix which is based on the outcome of this
diff --git a/repos/system_upgrade/el8toel9/actors/checkvdo/actor.py b/repos/system_upgrade/el8toel9/actors/checkvdo/actor.py
index c28b3a98..4158253a 100644
--- a/repos/system_upgrade/el8toel9/actors/checkvdo/actor.py
+++ b/repos/system_upgrade/el8toel9/actors/checkvdo/actor.py
@@ -12,7 +12,7 @@ class CheckVdo(Actor):
`Background`
============
- In RHEL 9.0 the indepdent VDO management software, `vdo manager`, is
+ In RHEL 9.0 the independent VDO management software, `vdo manager`, is
superseded by LVM management. Existing VDOs must be converted to LVM-based
management *before* upgrading to RHEL 9.0.
diff --git a/repos/system_upgrade/el8toel9/actors/checkvdo/libraries/checkvdo.py b/repos/system_upgrade/el8toel9/actors/checkvdo/libraries/checkvdo.py
index 9ba5c70c..135a279d 100644
--- a/repos/system_upgrade/el8toel9/actors/checkvdo/libraries/checkvdo.py
+++ b/repos/system_upgrade/el8toel9/actors/checkvdo/libraries/checkvdo.py
@@ -40,7 +40,7 @@ def _process_post_conversion_vdos(vdos):
'device format level; however, the expected LVM management '
'portion of the conversion did not take place. This '
'indicates that an exceptional condition (for example, a '
- 'system crash) likely occured during the conversion '
+ 'system crash) likely occurred during the conversion '
'process. The LVM portion of the conversion must be '
'performed in order for upgrade to proceed.'))
diff --git a/repos/system_upgrade/el8toel9/actors/dotnet/tests/test_dotnet.py b/repos/system_upgrade/el8toel9/actors/dotnet/tests/test_dotnet.py
index 744a4e0b..93fae569 100644
--- a/repos/system_upgrade/el8toel9/actors/dotnet/tests/test_dotnet.py
+++ b/repos/system_upgrade/el8toel9/actors/dotnet/tests/test_dotnet.py
@@ -33,7 +33,7 @@ def test_actor_execution(monkeypatch, current_actor_context, unsupported_version
for version in unsupported_versions:
rpms += [_generate_rpm_with_name(f'dotnet-runtime-{version}')]
- # Executed actor feeded with fake RPMs
+ # Executed actor fed with fake RPMs
current_actor_context.feed(InstalledRedHatSignedRPM(items=rpms))
current_actor_context.run()
diff --git a/repos/system_upgrade/el8toel9/actors/mariadbcheck/tests/test_mariadbcheck.py b/repos/system_upgrade/el8toel9/actors/mariadbcheck/tests/test_mariadbcheck.py
index e91345f2..15e70ede 100644
--- a/repos/system_upgrade/el8toel9/actors/mariadbcheck/tests/test_mariadbcheck.py
+++ b/repos/system_upgrade/el8toel9/actors/mariadbcheck/tests/test_mariadbcheck.py
@@ -35,7 +35,7 @@ def test_actor_execution(monkeypatch, has_server):
Parametrized helper function for test_actor_* functions.
First generate list of RPM models based on set arguments. Then, run
- the actor feeded with our RPM list. Finally, assert Reports
+ the actor fed with our RPM list. Finally, assert Reports
according to set arguments.
Parameters:
@@ -54,7 +54,7 @@ def test_actor_execution(monkeypatch, has_server):
monkeypatch.setattr(api, 'current_actor', curr_actor_mocked)
monkeypatch.setattr(reporting, "create_report", create_report_mocked())
- # Executed actor feeded with fake RPMs
+ # Executed actor fed with fake RPMs
report_installed_packages(_context=api)
if has_server:
diff --git a/repos/system_upgrade/el8toel9/actors/multipathconfread/actor.py b/repos/system_upgrade/el8toel9/actors/multipathconfread/actor.py
index 92184c70..ec558cbe 100644
--- a/repos/system_upgrade/el8toel9/actors/multipathconfread/actor.py
+++ b/repos/system_upgrade/el8toel9/actors/multipathconfread/actor.py
@@ -6,7 +6,7 @@ from leapp.tags import FactsPhaseTag, IPUWorkflowTag
class MultipathConfRead8to9(Actor):
"""
- Read multipath configuration files and extract the necessary informaton
+ Read multipath configuration files and extract the necessary information
Related files:
- /etc/multipath.conf
diff --git a/repos/system_upgrade/el8toel9/actors/nischeck/libraries/nischeck.py b/repos/system_upgrade/el8toel9/actors/nischeck/libraries/nischeck.py
index 6bd15991..7e3d9a80 100644
--- a/repos/system_upgrade/el8toel9/actors/nischeck/libraries/nischeck.py
+++ b/repos/system_upgrade/el8toel9/actors/nischeck/libraries/nischeck.py
@@ -23,7 +23,7 @@ def report_nis():
Create the report if any of NIS packages (RH signed)
is installed and configured.
- Should notify user about present NIS compnent package
+ Should notify user about present NIS component package
installation, warn them about discontinuation, and
redirect them to online documentation for possible
alternatives.
diff --git a/repos/system_upgrade/el8toel9/actors/nischeck/tests/test_nischeck.py b/repos/system_upgrade/el8toel9/actors/nischeck/tests/test_nischeck.py
index 7ebde0ac..7bdfed02 100644
--- a/repos/system_upgrade/el8toel9/actors/nischeck/tests/test_nischeck.py
+++ b/repos/system_upgrade/el8toel9/actors/nischeck/tests/test_nischeck.py
@@ -31,11 +31,11 @@ def test_actor_nis(monkeypatch, pkgs_installed, pkgs_configured):
Parametrized helper function for test_actor_* functions.
First generate list of RPM models based on set arguments. Then, run
- the actor feeded with our RPM list and mocked functions. Finally, assert
+ the actor fed with our RPM list and mocked functions. Finally, assert
Reports according to set arguments.
Parameters:
- pkgs_installed (touple): installed pkgs
+ pkgs_installed (tuple): installed pkgs
fill_conf_file (bool): not default ypbind config file
fill_ypserv_dir (bool): not default ypserv dir content
"""
@@ -55,7 +55,7 @@ def test_actor_nis(monkeypatch, pkgs_installed, pkgs_configured):
monkeypatch.setattr(api, 'current_actor', curr_actor_mocked)
monkeypatch.setattr(reporting, "create_report", create_report_mocked())
- # Executed actor feeded with out fake msgs
+ # Executed actor fed with out fake msgs
nischeck.report_nis()
# Iterate through installed packages
diff --git a/repos/system_upgrade/el8toel9/actors/nisscanner/libraries/nisscan.py b/repos/system_upgrade/el8toel9/actors/nisscanner/libraries/nisscan.py
index 541d4037..9910f748 100644
--- a/repos/system_upgrade/el8toel9/actors/nisscanner/libraries/nisscan.py
+++ b/repos/system_upgrade/el8toel9/actors/nisscanner/libraries/nisscan.py
@@ -26,7 +26,7 @@ class NISScanLibrary:
lines = [line.strip() for line in f.readlines() if line.strip()]
for line in lines:
- # Cheks for any valid configuration entry
+ # Checks for any valid configuration entry
if not line.startswith('#'):
return True
return False
diff --git a/repos/system_upgrade/el8toel9/actors/nisscanner/tests/test_nisscan.py b/repos/system_upgrade/el8toel9/actors/nisscanner/tests/test_nisscan.py
index 8f463641..ed000ce0 100644
--- a/repos/system_upgrade/el8toel9/actors/nisscanner/tests/test_nisscan.py
+++ b/repos/system_upgrade/el8toel9/actors/nisscanner/tests/test_nisscan.py
@@ -32,11 +32,11 @@ def test_actor_nisscan(monkeypatch, pkgs_installed, fill_conf_file, fill_ypserv_
"""
Parametrized helper function for test_actor_* functions.
- Run the actor feeded with our mocked functions and assert
+ Run the actor fed with our mocked functions and assert
produced messages according to set arguments.
Parameters:
- pkgs_installed (touple): installed pkgs
+ pkgs_installed (tuple): installed pkgs
fill_conf_file (bool): not default ypbind config file
fill_ypserv_dir (bool): not default ypserv dir content
"""
@@ -64,7 +64,7 @@ def test_actor_nisscan(monkeypatch, pkgs_installed, fill_conf_file, fill_ypserv_
monkeypatch.setattr(nisscan.os.path, 'isfile', lambda dummy: mocked_isfile)
monkeypatch.setattr(nisscan.os.path, 'isdir', lambda dummy: mocked_isdir)
- # Executed actor feeded with mocked functions
+ # Executed actor fed with mocked functions
nisscan.NISScanLibrary().process()
# Filter NIS pkgs
diff --git a/repos/system_upgrade/el8toel9/actors/opensshdropindirectory/libraries/opensshdropindirectory.py b/repos/system_upgrade/el8toel9/actors/opensshdropindirectory/libraries/opensshdropindirectory.py
index d55eee1c..3b4b24f8 100644
--- a/repos/system_upgrade/el8toel9/actors/opensshdropindirectory/libraries/opensshdropindirectory.py
+++ b/repos/system_upgrade/el8toel9/actors/opensshdropindirectory/libraries/opensshdropindirectory.py
@@ -13,7 +13,7 @@ INCLUDE_BLOCK = ''.join(('# Added by leapp during upgrade from RHEL8 to RHEL9\n'
def prepend_string_if_not_present(f, content, check_string):
"""
- This reads the open file descriptor and checks for presense of the `check_string`.
+ This reads the open file descriptor and checks for presence of the `check_string`.
If not present, the `content` is prepended to the original content of the file and
result is written.
Note, that this requires opened file for both reading and writing, for example with:
diff --git a/repos/system_upgrade/el8toel9/actors/opensshdropindirectorycheck/actor.py b/repos/system_upgrade/el8toel9/actors/opensshdropindirectorycheck/actor.py
index b1b445bc..19f0e44d 100644
--- a/repos/system_upgrade/el8toel9/actors/opensshdropindirectorycheck/actor.py
+++ b/repos/system_upgrade/el8toel9/actors/opensshdropindirectorycheck/actor.py
@@ -47,7 +47,7 @@ class OpenSshDropInDirectoryCheck(Actor):
reporting.RelatedResource('file', '/etc/ssh/sshd_config')
]
reporting.create_report([
- reporting.Title('The upgrade will prepend the Incude directive to OpenSSH sshd_config'),
+ reporting.Title('The upgrade will prepend the Include directive to OpenSSH sshd_config'),
reporting.Summary(
'OpenSSH server configuration needs to be modified to contain Include directive '
'for the RHEL9 to work properly and integrate with the other parts of the OS. '
diff --git a/repos/system_upgrade/el8toel9/actors/opensslproviders/libraries/add_provider.py b/repos/system_upgrade/el8toel9/actors/opensslproviders/libraries/add_provider.py
index fb287ce4..91462f18 100644
--- a/repos/system_upgrade/el8toel9/actors/opensslproviders/libraries/add_provider.py
+++ b/repos/system_upgrade/el8toel9/actors/opensslproviders/libraries/add_provider.py
@@ -71,7 +71,7 @@ def _append(lines, add, comment=None):
def _modify_file(f, fail_on_error=True):
"""
- Modify the openssl configuration file to accomodate el8toel9 changes
+ Modify the openssl configuration file to accommodate el8toel9 changes
"""
lines = f.readlines()
lines = _replace(lines, r"openssl_conf\s*=\s*default_modules",
diff --git a/repos/system_upgrade/el8toel9/actors/postgresqlcheck/tests/test_postgresqlcheck.py b/repos/system_upgrade/el8toel9/actors/postgresqlcheck/tests/test_postgresqlcheck.py
index 41d3a30b..7b6f4384 100644
--- a/repos/system_upgrade/el8toel9/actors/postgresqlcheck/tests/test_postgresqlcheck.py
+++ b/repos/system_upgrade/el8toel9/actors/postgresqlcheck/tests/test_postgresqlcheck.py
@@ -35,7 +35,7 @@ def test_actor_execution(monkeypatch, has_server):
Parametrized helper function for test_actor_* functions.
First generate list of RPM models based on set arguments. Then, run
- the actor feeded with our RPM list. Finally, assert Reports
+ the actor fed with our RPM list. Finally, assert Reports
according to set arguments.
Parameters:
@@ -54,7 +54,7 @@ def test_actor_execution(monkeypatch, has_server):
monkeypatch.setattr(api, 'current_actor', curr_actor_mocked)
monkeypatch.setattr(reporting, "create_report", create_report_mocked())
- # Executed actor feeded with out fake RPMs
+ # Executed actor fed with out fake RPMs
report_installed_packages(_context=api)
if has_server:
diff --git a/repos/system_upgrade/el8toel9/actors/pythonthreetmpworkaround/actor.py b/repos/system_upgrade/el8toel9/actors/pythonthreetmpworkaround/actor.py
index cb04a268..b3737380 100644
--- a/repos/system_upgrade/el8toel9/actors/pythonthreetmpworkaround/actor.py
+++ b/repos/system_upgrade/el8toel9/actors/pythonthreetmpworkaround/actor.py
@@ -13,7 +13,7 @@ class PythonThreeTmpWorkaround(Actor):
During the RPM upgrade the /usr/bin/python3 is removed because of problem
in alternatives. The fix requires new builds of python36 on RHEL8, python3
- on RHEL 9 ans alternatives on both systems. Once the internal repositories
+ on RHEL 9 and alternatives on both systems. Once the internal repositories
are updated, we can drop this. If the /usr/bin/python3 file exists,
do nothing.
"""
diff --git a/repos/system_upgrade/el8toel9/actors/targetuserspacecryptopolicies/libraries/targetuserspacecryptopolicies.py b/repos/system_upgrade/el8toel9/actors/targetuserspacecryptopolicies/libraries/targetuserspacecryptopolicies.py
index 93eea5b0..ddb7ad33 100644
--- a/repos/system_upgrade/el8toel9/actors/targetuserspacecryptopolicies/libraries/targetuserspacecryptopolicies.py
+++ b/repos/system_upgrade/el8toel9/actors/targetuserspacecryptopolicies/libraries/targetuserspacecryptopolicies.py
@@ -41,7 +41,7 @@ def _set_crypto_policy(context, current_policy):
def process():
target_userspace_info = next(api.consume(TargetUserSpaceInfo), None)
if not target_userspace_info:
- # nothing to do - an error occured in previous actors and upgrade will be inhibited
+ # nothing to do - an error occurred in previous actors and upgrade will be inhibited
api.current_logger().error('Missing the TargetUserSpaceInfo message. Probably it has not been created before.')
return
cpi = next(api.consume(CryptoPolicyInfo), None)
diff --git a/repos/system_upgrade/el8toel9/actors/vdoconversionscanner/actor.py b/repos/system_upgrade/el8toel9/actors/vdoconversionscanner/actor.py
index 3061e206..035299e3 100644
--- a/repos/system_upgrade/el8toel9/actors/vdoconversionscanner/actor.py
+++ b/repos/system_upgrade/el8toel9/actors/vdoconversionscanner/actor.py
@@ -10,7 +10,7 @@ class VdoConversionScanner(Actor):
A VdoConversionInfo message containing the data will be produced.
- In RHEL 9.0 the indepdent VDO management software, `vdo manager`, is
+ In RHEL 9.0 the independent VDO management software, `vdo manager`, is
superseded by LVM management. Existing VDOs must be converted to LVM-based
management *before* upgrading to RHEL 9.0.
diff --git a/repos/system_upgrade/el8toel9/models/opensslconfig.py b/repos/system_upgrade/el8toel9/models/opensslconfig.py
index 94fcbcbd..831256d2 100644
--- a/repos/system_upgrade/el8toel9/models/opensslconfig.py
+++ b/repos/system_upgrade/el8toel9/models/opensslconfig.py
@@ -58,7 +58,7 @@ class OpenSslConfig(Model):
It is used to load default TLS policy in RHEL8, but controls loading of all
providers in RHEL9 so it needs to be adjusted for upgrade. This is listed
- befor any block.
+ before any block.
"""
blocks = fields.List(fields.Model(OpenSslConfigBlock))
diff --git a/utils/ibdmp-decode b/utils/ibdmp-decode
index 74a8dd2a..1386835e 100755
--- a/utils/ibdmp-decode
+++ b/utils/ibdmp-decode
@@ -16,7 +16,7 @@ def USAGE():
lines = [
"usage: %s path/to/console.log path/to/target.tar.xz" % self,
"",
- "Decode debug tarball emited by leapp's initramfs in-band",
+ "Decode debug tarball emitted by leapp's initramfs in-band",
"console debugger, ibdmp().",
]
sys.stderr.writelines('%s\n' % l for l in lines)
--
2.38.1
Reference in New Issue View Git Blame Copy Permalink