From 579b60cb07831d790f424afc0e289cd1a4bcba1d Mon Sep 17 00:00:00 2001 From: wangzhe Date: Tue, 28 Mar 2023 19:00:56 +0800 Subject: [PATCH] Add python-devel version check and update --- ...ython-devel-version-check-and-update.patch | 62 +++++++++++++++++++ leapp-repository.spec | 6 +- 2 files changed, 67 insertions(+), 1 deletion(-) create mode 100644 0041-Add-python-devel-version-check-and-update.patch diff --git a/0041-Add-python-devel-version-check-and-update.patch b/0041-Add-python-devel-version-check-and-update.patch new file mode 100644 index 0000000..b36fbe6 --- /dev/null +++ b/0041-Add-python-devel-version-check-and-update.patch @@ -0,0 +1,62 @@ +From d2dae61df5de1b4ee00f11eb1aad0c9b009b22d4 Mon Sep 17 00:00:00 2001 +From: wangzhe +Date: Tue, 28 Mar 2023 16:59:28 +0800 +Subject: [PATCH] Add python-devel version check and update + +--- + .../el7toel8/actors/checkpkgforupgrade/actor.py | 35 ++++++++++++++++++++++ + 1 file changed, 35 insertions(+) + +diff --git a/repos/system_upgrade/el7toel8/actors/checkpkgforupgrade/actor.py b/repos/system_upgrade/el7toel8/actors/checkpkgforupgrade/actor.py +index 5c7b0a0..9f4907b 100644 +--- a/repos/system_upgrade/el7toel8/actors/checkpkgforupgrade/actor.py ++++ b/repos/system_upgrade/el7toel8/actors/checkpkgforupgrade/actor.py +@@ -35,6 +35,20 @@ class CheckPackagesForUpgrade(Actor): + ), + ) + ), ++ Dialog( ++ scope='update_python-devel', ++ reason='Confirmation', ++ components=( ++ BooleanComponent( ++ key='confirm', ++ label='Update python-devel ? ' ++ 'If not, the upgrade process will be interrupted.', ++ description='python-devel version is too low for system upgrade.', ++ reason='python-devel version must be upgrade to version >= 2.7.5-77, ' ++ 'otherwise system upgrade will get failed after reboot.' ++ ), ++ ) ++ ), + ) + + def get_releasever_of_rpm(self, pkg_name): +@@ -87,3 +101,24 @@ class CheckPackagesForUpgrade(Actor): + reporting.Remediation(commands=commands), + reporting.RelatedResource('package', 'grub2'), + ]) ++ ++ if has_package(InstalledRedHatSignedRPM, 'python-devel'): ++ python_devel_version = self.get_releasever_of_rpm('python-devel') ++ ++ if self.compare_version(python_devel_version, '77.el7_6') <= 0: ++ answer = self.get_answers(self.dialogs[1]) ++ if answer.get('confirm') == True: ++ subprocess.call(['yum', 'update', '-y', 'python-devel']) ++ else: ++ commands = [['yum', '-y', 'update', 'python-devel']] ++ create_report([ ++ reporting.Title('python-devel version is too low for system upgrade'), ++ reporting.Summary( ++ 'python-devel version must be upgrade to version > 2.7.5-77, ' ++ 'otherwise system upgrade will get failed after reboot.' ++ ), ++ reporting.Severity(reporting.Severity.HIGH), ++ reporting.Flags([reporting.Flags.INHIBITOR]), ++ reporting.Remediation(commands=commands), ++ reporting.RelatedResource('package', 'python-devel'), ++ ]) +-- +1.8.3.1 + diff --git a/leapp-repository.spec b/leapp-repository.spec index 9f0ee89..c1577e5 100644 --- a/leapp-repository.spec +++ b/leapp-repository.spec @@ -11,7 +11,7 @@ }\ py2_byte_compile "%1" "%2"} -%define anolis_release 19 +%define anolis_release 20 Name: leapp-repository Version: 0.13.0 @@ -66,6 +66,7 @@ Patch37: 0037-Add-RPMDownloadOrInstallError-and-its-exit-code.patch Patch38: 0038-Provides-more-information-for-debug-purpose-when-exc.patch Patch39: 0039-Add-grub2-tools-update-into-answerfile.patch Patch40: 0040-Fix-colloecting-virtio-nic-info-error.patch +Patch41: 0041-Add-python-devel-version-check-and-update.patch BuildArch: noarch BuildRequires: python-devel @@ -194,6 +195,9 @@ done; # no files here %changelog +* Tue Mar 28 2023 wangzhe - 0.13.0-2.20 +- Add python-devel version check and update. + * Sat Mar 25 2023 guo chuang - 0.13.0-2.19 - Fixed the issue that collecting virtio type NIC information failed from the centos 7.4 -- Gitee