forked from rpms/leapp-repository
75c9028095
- Enable new upgrade path for RHEL 8.10 -> RHEL 9.4 (including RHEL with SAP HANA) - Introduce generic transition of systemd services states during the IPU - Introduce possibility to upgrade with local repositories - Improve possibilities of upgrade when a proxy is configured in DNF configutation file - Fix handling of symlinks under /etc/pki when managing certificates - Fix the upgrade with custom https repositories - Default to the NO_RHSM mode when subscription-manager is not installed - Detect customized configuration of dynamic linker - Drop the invalid `tuv` target channel for the --channel option - Fix the issue of going out of bounds in the isccfg parser - Fix traceback when saving the rhsm facts results and the /etc/rhsm/facts directory doesn’t exist yet - Load all rpm repository substitutions that dnf knows about, not just "releasever" only - Simplify handling of upgrades on systems using RHUI, reducing the maintenance burden for cloud providers - Detect possible unexpected RPM GPG keys has been installed during RPM transaction - Resolves: RHEL-16729
210 lines
12 KiB
Diff
210 lines
12 KiB
Diff
From d74ff90e46c1acc2a16dc387a863f2aaf86f85d1 Mon Sep 17 00:00:00 2001
|
|
From: PeterMocary <petermocary@gmail.com>
|
|
Date: Mon, 9 Oct 2023 23:35:30 +0200
|
|
Subject: [PATCH 16/38] make pylint and spellcheck happy again
|
|
|
|
---
|
|
.pylintrc | 4 +++-
|
|
.../common/actors/checksaphana/libraries/checksaphana.py | 4 ++--
|
|
.../actors/checktargetiso/libraries/check_target_iso.py | 2 +-
|
|
.../files/dracut/85sys-upgrade-redhat/do-upgrade.sh | 2 +-
|
|
.../actors/createisorepofile/libraries/create_iso_repofile.py | 2 +-
|
|
.../repositoriesmapping/libraries/repositoriesmapping.py | 2 +-
|
|
.../system_upgrade/common/actors/scancpu/libraries/scancpu.py | 2 +-
|
|
.../common/actors/scansaphana/libraries/scansaphana.py | 4 ++--
|
|
.../actors/scantargetiso/libraries/scan_target_os_iso.py | 4 ++--
|
|
.../actors/targetuserspacecreator/libraries/userspacegen.py | 4 ++--
|
|
repos/system_upgrade/common/libraries/rhui.py | 2 +-
|
|
repos/system_upgrade/common/libraries/tests/test_rhsm.py | 2 +-
|
|
12 files changed, 18 insertions(+), 16 deletions(-)
|
|
|
|
diff --git a/.pylintrc b/.pylintrc
|
|
index 2ef31167..0adb7dcc 100644
|
|
--- a/.pylintrc
|
|
+++ b/.pylintrc
|
|
@@ -54,7 +54,9 @@ disable=
|
|
duplicate-string-formatting-argument, # TMP: will be fixed in close future
|
|
consider-using-f-string, # sorry, not gonna happen, still have to support py2
|
|
use-dict-literal,
|
|
- redundant-u-string-prefix # still have py2 to support
|
|
+ redundant-u-string-prefix, # still have py2 to support
|
|
+ logging-format-interpolation,
|
|
+ logging-not-lazy
|
|
|
|
[FORMAT]
|
|
# Maximum number of characters on a single line.
|
|
diff --git a/repos/system_upgrade/common/actors/checksaphana/libraries/checksaphana.py b/repos/system_upgrade/common/actors/checksaphana/libraries/checksaphana.py
|
|
index 1b08f3d2..7cd83de8 100644
|
|
--- a/repos/system_upgrade/common/actors/checksaphana/libraries/checksaphana.py
|
|
+++ b/repos/system_upgrade/common/actors/checksaphana/libraries/checksaphana.py
|
|
@@ -132,7 +132,7 @@ def _major_version_check(instance):
|
|
return False
|
|
return True
|
|
except (ValueError, IndexError):
|
|
- api.current_logger().warn(
|
|
+ api.current_logger().warning(
|
|
'Failed to parse manifest release field for instance {}'.format(instance.name), exc_info=True)
|
|
return False
|
|
|
|
@@ -164,7 +164,7 @@ def _sp_rev_patchlevel_check(instance, patchlevels):
|
|
return True
|
|
return False
|
|
# if not 'len(number) > 2 and number.isdigit()'
|
|
- api.current_logger().warn(
|
|
+ api.current_logger().warning(
|
|
'Invalid rev-number field value `{}` in manifest for instance {}'.format(number, instance.name))
|
|
return False
|
|
|
|
diff --git a/repos/system_upgrade/common/actors/checktargetiso/libraries/check_target_iso.py b/repos/system_upgrade/common/actors/checktargetiso/libraries/check_target_iso.py
|
|
index b5b66901..fcb23028 100644
|
|
--- a/repos/system_upgrade/common/actors/checktargetiso/libraries/check_target_iso.py
|
|
+++ b/repos/system_upgrade/common/actors/checktargetiso/libraries/check_target_iso.py
|
|
@@ -170,7 +170,7 @@ def perform_target_iso_checks():
|
|
return
|
|
|
|
if next(requested_target_iso_msg_iter, None):
|
|
- api.current_logger().warn('Received multiple msgs with target ISO to use.')
|
|
+ api.current_logger().warning('Received multiple msgs with target ISO to use.')
|
|
|
|
# Cascade the inhibiting conditions so that we do not spam the user with inhibitors
|
|
is_iso_invalid = inhibit_if_not_valid_iso_file(target_iso)
|
|
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 491b85ec..c181c5cf 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
|
|
@@ -130,7 +130,7 @@ ibdmp() {
|
|
#
|
|
# 1. encode tarball using base64
|
|
#
|
|
- # 2. pre-pend line `chunks=CHUNKS,md5=MD5` where
|
|
+ # 2. prepend line `chunks=CHUNKS,md5=MD5` where
|
|
# MD5 is the MD5 digest of original tarball and
|
|
# CHUNKS is number of upcoming Base64 chunks
|
|
#
|
|
diff --git a/repos/system_upgrade/common/actors/createisorepofile/libraries/create_iso_repofile.py b/repos/system_upgrade/common/actors/createisorepofile/libraries/create_iso_repofile.py
|
|
index b4470b68..3f4f75e0 100644
|
|
--- a/repos/system_upgrade/common/actors/createisorepofile/libraries/create_iso_repofile.py
|
|
+++ b/repos/system_upgrade/common/actors/createisorepofile/libraries/create_iso_repofile.py
|
|
@@ -13,7 +13,7 @@ def produce_repofile_if_iso_used():
|
|
return
|
|
|
|
if next(target_iso_msgs_iter, None):
|
|
- api.current_logger().warn('Received multiple TargetISInstallationImage messages, using the first one')
|
|
+ api.current_logger().warning('Received multiple TargetISInstallationImage messages, using the first one')
|
|
|
|
# Mounting was successful, create a repofile to copy into target userspace
|
|
repofile_entry_template = ('[{repoid}]\n'
|
|
diff --git a/repos/system_upgrade/common/actors/repositoriesmapping/libraries/repositoriesmapping.py b/repos/system_upgrade/common/actors/repositoriesmapping/libraries/repositoriesmapping.py
|
|
index 416034ac..6f2b2e0f 100644
|
|
--- a/repos/system_upgrade/common/actors/repositoriesmapping/libraries/repositoriesmapping.py
|
|
+++ b/repos/system_upgrade/common/actors/repositoriesmapping/libraries/repositoriesmapping.py
|
|
@@ -145,7 +145,7 @@ def _inhibit_upgrade(msg):
|
|
def _read_repofile(repofile):
|
|
# NOTE: what about catch StopActorExecution error when the file cannot be
|
|
# obtained -> then check whether old_repomap file exists and in such a case
|
|
- # inform user they have to provde the new repomap.json file (we have the
|
|
+ # inform user they have to provide the new repomap.json file (we have the
|
|
# warning now only which could be potentially overlooked)
|
|
repofile_data = load_data_asset(api.current_actor(),
|
|
repofile,
|
|
diff --git a/repos/system_upgrade/common/actors/scancpu/libraries/scancpu.py b/repos/system_upgrade/common/actors/scancpu/libraries/scancpu.py
|
|
index e5555f99..9de50fae 100644
|
|
--- a/repos/system_upgrade/common/actors/scancpu/libraries/scancpu.py
|
|
+++ b/repos/system_upgrade/common/actors/scancpu/libraries/scancpu.py
|
|
@@ -133,7 +133,7 @@ def _find_deprecation_data_entries(lscpu):
|
|
if is_detected(lscpu, entry)
|
|
]
|
|
|
|
- api.current_logger().warn('Unsupported platform could not detect relevant CPU information')
|
|
+ api.current_logger().warning('Unsupported platform could not detect relevant CPU information')
|
|
return []
|
|
|
|
|
|
diff --git a/repos/system_upgrade/common/actors/scansaphana/libraries/scansaphana.py b/repos/system_upgrade/common/actors/scansaphana/libraries/scansaphana.py
|
|
index 04195b57..99490477 100644
|
|
--- a/repos/system_upgrade/common/actors/scansaphana/libraries/scansaphana.py
|
|
+++ b/repos/system_upgrade/common/actors/scansaphana/libraries/scansaphana.py
|
|
@@ -37,7 +37,7 @@ def parse_manifest(path):
|
|
# Most likely an empty line, but we're being permissive here and ignore failures.
|
|
# In the end it's all about having the right values available.
|
|
if line:
|
|
- api.current_logger().warn(
|
|
+ api.current_logger().warning(
|
|
'Failed to parse line in manifest: {file}. Line was: `{line}`'.format(file=path,
|
|
line=line),
|
|
exc_info=True)
|
|
@@ -128,6 +128,6 @@ def get_instance_status(instance_number, sapcontrol_path, admin_name):
|
|
# In that case there are always more than 7 lines.
|
|
return len(output['stdout'].split('\n')) > 7
|
|
except CalledProcessError:
|
|
- api.current_logger().warn(
|
|
+ api.current_logger().warning(
|
|
'Failed to retrieve SAP HANA instance status from sapcontrol - Considering it as not running.')
|
|
return False
|
|
diff --git a/repos/system_upgrade/common/actors/scantargetiso/libraries/scan_target_os_iso.py b/repos/system_upgrade/common/actors/scantargetiso/libraries/scan_target_os_iso.py
|
|
index 281389cf..a5f0750a 100644
|
|
--- a/repos/system_upgrade/common/actors/scantargetiso/libraries/scan_target_os_iso.py
|
|
+++ b/repos/system_upgrade/common/actors/scantargetiso/libraries/scan_target_os_iso.py
|
|
@@ -18,8 +18,8 @@ def determine_rhel_version_from_iso_mountpoint(iso_mountpoint):
|
|
return '' # We did not determine anything
|
|
|
|
if len(redhat_release_pkgs) > 1:
|
|
- api.current_logger().warn('Multiple packages with name redhat-release* found when '
|
|
- 'determining RHEL version of the supplied installation ISO.')
|
|
+ api.current_logger().warning('Multiple packages with name redhat-release* found when '
|
|
+ 'determining RHEL version of the supplied installation ISO.')
|
|
|
|
redhat_release_pkg = redhat_release_pkgs[0]
|
|
|
|
diff --git a/repos/system_upgrade/common/actors/targetuserspacecreator/libraries/userspacegen.py b/repos/system_upgrade/common/actors/targetuserspacecreator/libraries/userspacegen.py
|
|
index 9dfa0f14..0982a796 100644
|
|
--- a/repos/system_upgrade/common/actors/targetuserspacecreator/libraries/userspacegen.py
|
|
+++ b/repos/system_upgrade/common/actors/targetuserspacecreator/libraries/userspacegen.py
|
|
@@ -347,7 +347,7 @@ def _get_files_owned_by_rpms(context, dirpath, pkgs=None, recursive=False):
|
|
|
|
def _copy_certificates(context, target_userspace):
|
|
"""
|
|
- Copy the needed cetificates into the container, but preserve original ones
|
|
+ Copy the needed certificates into the container, but preserve original ones
|
|
|
|
Some certificates are already installed in the container and those are
|
|
default certificates for the target OS, so we preserve these.
|
|
@@ -378,7 +378,7 @@ def _copy_certificates(context, target_userspace):
|
|
|
|
# The path original path of the broken symlink in the container
|
|
report_path = os.path.join(target_pki, os.path.relpath(src_path, backup_pki))
|
|
- api.current_logger().warn('File {} is a broken symlink!'.format(report_path))
|
|
+ api.current_logger().warning('File {} is a broken symlink!'.format(report_path))
|
|
break
|
|
|
|
src_path = next_path
|
|
diff --git a/repos/system_upgrade/common/libraries/rhui.py b/repos/system_upgrade/common/libraries/rhui.py
|
|
index 4578ecd2..14a91c42 100644
|
|
--- a/repos/system_upgrade/common/libraries/rhui.py
|
|
+++ b/repos/system_upgrade/common/libraries/rhui.py
|
|
@@ -258,7 +258,7 @@ def gen_rhui_files_map():
|
|
|
|
def copy_rhui_data(context, provider):
|
|
"""
|
|
- Copy relevant RHUI cerificates and key into the target userspace container
|
|
+ Copy relevant RHUI certificates and key into the target userspace container
|
|
"""
|
|
rhui_dir = api.get_common_folder_path('rhui')
|
|
data_dir = os.path.join(rhui_dir, provider)
|
|
diff --git a/repos/system_upgrade/common/libraries/tests/test_rhsm.py b/repos/system_upgrade/common/libraries/tests/test_rhsm.py
|
|
index a6dbea96..957616f4 100644
|
|
--- a/repos/system_upgrade/common/libraries/tests/test_rhsm.py
|
|
+++ b/repos/system_upgrade/common/libraries/tests/test_rhsm.py
|
|
@@ -249,7 +249,7 @@ def test_get_release_with_release_not_set(monkeypatch, actor_mocked, context_moc
|
|
|
|
release = rhsm.get_release(context_mocked)
|
|
|
|
- fail_description = 'The release information was obtained, even if "No release set" was repored by rhsm.'
|
|
+ fail_description = 'The release information was obtained, even if "No release set" was reported by rhsm.'
|
|
assert not release, fail_description
|
|
|
|
|
|
--
|
|
2.41.0
|
|
|