b4aed63dad
- Enable new upgrade path RHEL 8.10 -> 9.5 - Minor updates in reports - Add information about leapp invocation to leapp.db - Resolves: RHEL-27847
70 lines
3.7 KiB
Diff
70 lines
3.7 KiB
Diff
From 1fab8273744b3dba9c2acf927e6b87417d25f77b Mon Sep 17 00:00:00 2001
|
|
From: Evgeni Golov <evgeni@golov.de>
|
|
Date: Mon, 27 May 2024 11:51:43 +0200
|
|
Subject: [PATCH 47/49] fix some typos spotted by codespell
|
|
|
|
also add `zeor` to the ignore list as that's part of an email address at
|
|
`zeor.simegen.com`
|
|
---
|
|
.github/workflows/codespell.yml | 2 +-
|
|
.../common/actors/selinux/selinuxapplycustom/actor.py | 2 +-
|
|
repos/system_upgrade/common/libraries/overlaygen.py | 2 +-
|
|
.../checkcustomnetworkscripts/libraries/customnetworkscripts.py | 2 +-
|
|
4 files changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/.github/workflows/codespell.yml b/.github/workflows/codespell.yml
|
|
index c0ec20d6..002d3774 100644
|
|
--- a/.github/workflows/codespell.yml
|
|
+++ b/.github/workflows/codespell.yml
|
|
@@ -17,7 +17,7 @@ jobs:
|
|
- uses: actions/checkout@v4
|
|
- uses: codespell-project/actions-codespell@master
|
|
with:
|
|
- ignore_words_list: ro,fo,couldn,repositor
|
|
+ ignore_words_list: ro,fo,couldn,repositor,zeor
|
|
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/el8toel9/actors/xorgdrvfact/tests/files/journalctl-xorg-intel,\
|
|
diff --git a/repos/system_upgrade/common/actors/selinux/selinuxapplycustom/actor.py b/repos/system_upgrade/common/actors/selinux/selinuxapplycustom/actor.py
|
|
index b7f8376f..55c64c3e 100644
|
|
--- a/repos/system_upgrade/common/actors/selinux/selinuxapplycustom/actor.py
|
|
+++ b/repos/system_upgrade/common/actors/selinux/selinuxapplycustom/actor.py
|
|
@@ -26,7 +26,7 @@ class SELinuxApplyCustom(Actor):
|
|
tags = (ApplicationsPhaseTag, IPUWorkflowTag)
|
|
|
|
def process(self):
|
|
- # save progress for repoting purposes
|
|
+ # save progress for reporting purposes
|
|
failed_modules = []
|
|
failed_custom = []
|
|
|
|
diff --git a/repos/system_upgrade/common/libraries/overlaygen.py b/repos/system_upgrade/common/libraries/overlaygen.py
|
|
index 4bcbf32b..1132cde1 100644
|
|
--- a/repos/system_upgrade/common/libraries/overlaygen.py
|
|
+++ b/repos/system_upgrade/common/libraries/overlaygen.py
|
|
@@ -274,7 +274,7 @@ def _prepare_required_mounts(scratch_dir, mounts_dir, storage_info, scratch_rese
|
|
space_needed = scratch_reserve + _MAGICAL_CONSTANT_OVL_SIZE * len(mount_points)
|
|
_ensure_enough_diskimage_space(space_needed, scratch_dir)
|
|
|
|
- # free space required on this partition should not be affected by durin the
|
|
+ # free space required on this partition should not be affected by during the
|
|
# upgrade transaction execution by space consumed on creation of disk images
|
|
# as disk images are cleaned in the end of this functions,
|
|
# but we want to reserve some space in advance.
|
|
diff --git a/repos/system_upgrade/el8toel9/actors/checkcustomnetworkscripts/libraries/customnetworkscripts.py b/repos/system_upgrade/el8toel9/actors/checkcustomnetworkscripts/libraries/customnetworkscripts.py
|
|
index c3a6ffd1..2947aa27 100644
|
|
--- a/repos/system_upgrade/el8toel9/actors/checkcustomnetworkscripts/libraries/customnetworkscripts.py
|
|
+++ b/repos/system_upgrade/el8toel9/actors/checkcustomnetworkscripts/libraries/customnetworkscripts.py
|
|
@@ -28,7 +28,7 @@ def generate_report(existing_custom_network_scripts):
|
|
reporting.Remediation(
|
|
hint=(
|
|
"Migrate the custom network-scripts to NetworkManager dispatcher"
|
|
- " scripts manually before the ugprade. Follow instructions in the"
|
|
+ " scripts manually before the upgrade. Follow instructions in the"
|
|
" official documentation."
|
|
)
|
|
),
|
|
--
|
|
2.44.0
|
|
|