From 0ae6219b6b5840a1027ff694680a5addc551e43d Mon Sep 17 00:00:00 2001 From: wangzhe Date: Wed, 12 Apr 2023 15:07:55 +0800 Subject: [PATCH] Add python-devel version check and update, Fix bug in grub2 version check --- ...ython-devel-version-check-and-update.patch | 54 +++++++++++++++---- leapp-repository.spec | 3 +- 2 files changed, 46 insertions(+), 11 deletions(-) diff --git a/0041-Add-python-devel-version-check-and-update.patch b/0041-Add-python-devel-version-check-and-update.patch index b36fbe6..af04a4f 100644 --- a/0041-Add-python-devel-version-check-and-update.patch +++ b/0041-Add-python-devel-version-check-and-update.patch @@ -1,14 +1,14 @@ -From d2dae61df5de1b4ee00f11eb1aad0c9b009b22d4 Mon Sep 17 00:00:00 2001 +From c36c419fe2821d5d0e86fb1b29f757c6f7ab4ce4 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 +Date: Wed, 12 Apr 2023 11:55:21 +0800 +Subject: [PATCH] Add python-devel version check and update. --- - .../el7toel8/actors/checkpkgforupgrade/actor.py | 35 ++++++++++++++++++++++ - 1 file changed, 35 insertions(+) + .../el7toel8/actors/checkpkgforupgrade/actor.py | 68 +++++++++++++++++----- + 1 file changed, 52 insertions(+), 16 deletions(-) diff --git a/repos/system_upgrade/el7toel8/actors/checkpkgforupgrade/actor.py b/repos/system_upgrade/el7toel8/actors/checkpkgforupgrade/actor.py -index 5c7b0a0..9f4907b 100644 +index 5c7b0a0..d52bdc7 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): @@ -32,10 +32,44 @@ index 5c7b0a0..9f4907b 100644 ) def get_releasever_of_rpm(self, pkg_name): -@@ -87,3 +101,24 @@ class CheckPackagesForUpgrade(Actor): - reporting.Remediation(commands=commands), - reporting.RelatedResource('package', 'grub2'), - ]) +@@ -70,20 +84,42 @@ class CheckPackagesForUpgrade(Actor): + def process(self): + if has_package(InstalledRedHatSignedRPM, 'grub2'): + grub2_version = self.get_releasever_of_rpm('grub2') +- answer = self.get_answers(self.dialogs[0]) + +- if self.compare_version(grub2_version, '0.64') < 0 and answer.get('confirm') == True: +- subprocess.call(['yum', 'update', 'grub2', '-y']) +- elif self.compare_version(grub2_version, '0.64') < 0: +- commands = [['yum', '-y', 'update', 'grub2']] +- create_report([ +- reporting.Title('grub2 version is too low for system upgrade'), +- reporting.Summary( +- 'grub2 version must be upgrade to version >= 2.02-0.64, ' +- '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', 'grub2'), +- ]) ++ if self.compare_version(grub2_version, '0.64') < 0: ++ answer = self.get_answers(self.dialogs[0]) ++ if answer.get('confirm') == True: ++ subprocess.call(['yum', 'update', '-y', 'grub2']) ++ else: ++ commands = [['yum', '-y', 'update', 'grub2']] ++ create_report([ ++ reporting.Title('grub2 version is too low for system upgrade'), ++ reporting.Summary( ++ 'grub2 version must be upgrade to version >= 2.02-0.64, ' ++ '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', 'grub2'), ++ ]) + + if has_package(InstalledRedHatSignedRPM, 'python-devel'): + python_devel_version = self.get_releasever_of_rpm('python-devel') diff --git a/leapp-repository.spec b/leapp-repository.spec index c1577e5..dfd63d0 100644 --- a/leapp-repository.spec +++ b/leapp-repository.spec @@ -195,8 +195,9 @@ done; # no files here %changelog -* Tue Mar 28 2023 wangzhe - 0.13.0-2.20 +* Wed Apr 12 2023 wangzhe - 0.13.0-2.20 - Add python-devel version check and update. +- Fix bug in grub2 version check * 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