From 9d85c056f41a54e2fc0f9f39d2fe54016a372d93 Mon Sep 17 00:00:00 2001 From: ZhouWeitao Date: Fri, 17 Feb 2023 16:50:46 +0800 Subject: [PATCH] comment patch 0031-Deal-with-EPEL-repositories-create-by-user-mannally.patch out Signed-off-by: ZhouWeitao --- ...repositories-create-by-user-mannally.patch | 103 ------------------ leapp-repository.spec | 3 +- 2 files changed, 2 insertions(+), 104 deletions(-) delete mode 100644 0031-Deal-with-EPEL-repositories-create-by-user-mannally.patch diff --git a/0031-Deal-with-EPEL-repositories-create-by-user-mannally.patch b/0031-Deal-with-EPEL-repositories-create-by-user-mannally.patch deleted file mode 100644 index a18f345..0000000 --- a/0031-Deal-with-EPEL-repositories-create-by-user-mannally.patch +++ /dev/null @@ -1,103 +0,0 @@ -From 37ab9cda0fa62dd1526f5fd4f4b1c7f81cbb9dab Mon Sep 17 00:00:00 2001 -From: Weisson -Date: Sun, 16 Oct 2022 18:31:15 +0800 -Subject: [PATCH] Deal with EPEL repositories create by user mannally. - -Signed-off-by: Weisson ---- - .../el7toel8/actors/rpmscanner/actor.py | 67 +++++++++++++++++++ - 1 file changed, 67 insertions(+) - -diff --git a/repos/system_upgrade/el7toel8/actors/rpmscanner/actor.py b/repos/system_upgrade/el7toel8/actors/rpmscanner/actor.py -index 27fe4b3..589e8a6 100644 ---- a/repos/system_upgrade/el7toel8/actors/rpmscanner/actor.py -+++ b/repos/system_upgrade/el7toel8/actors/rpmscanner/actor.py -@@ -4,6 +4,9 @@ from leapp.libraries.common.rpms import get_installed_rpms - from leapp.models import InstalledRPM, RPM - from leapp.tags import IPUWorkflowTag, FactsPhaseTag - -+import os -+from leapp.libraries import stdlib -+ - - class RpmScanner(Actor): - """ -@@ -17,6 +20,14 @@ class RpmScanner(Actor): - produces = (InstalledRPM,) - tags = (IPUWorkflowTag, FactsPhaseTag) - -+ epel_package_name = "epel-release" -+ -+ def epel_but_not_in_source(self): -+ epel_not_from_source = os.system("rpm -q %s" % self.epel_package_name) -+ epel_exists = not os.system("yum repolist | grep -q '^epel'") -+ -+ return epel_not_from_source and epel_exists -+ - def process(self): - output = get_installed_rpms() - pkg_repos = get_package_repository_data() -@@ -37,4 +48,60 @@ class RpmScanner(Actor): - release=release, - pgpsig=pgpsig, - repository=repository)) -+ -+ import subprocess -+ import re -+ -+ if self.epel_but_not_in_source(): -+ # disable epel repository -+ subprocess.check_output("yum install -y yum-utils", shell=True) -+ -+ repos = str(subprocess.check_output("yum repolist | grep -v '^repolist: ' | grep -v '^repo id ' | grep -v '^ * ' |" \ -+ "grep -v '^Loaded plugins: ' | grep -v '^Loading ' | awk '{ print $1 }' | xargs", shell=True)).strip() -+ -+ disable_repo_command = "yum-config-manager --disable " -+ -+ # repos = [ repo.split('/')[0] for repo in repos.split() ] -+ for repo_raw in repos.split(): -+ repo = repo_raw.split('/')[0].replace('!', '').replace('*', '') -+ if re.match(r"^epel", repo): -+ subprocess.check_output(disable_repo_command + repo, shell=True) -+ -+ # epel-release repository file backup -+ repo_paths = str(subprocess.check_output("repoquery -l %s | egrep '\.repo$'" % self.epel_package_name, shell=True)).strip().split() -+ for repo_path in repo_paths: -+ if os.path.exists(repo_path): -+ os.rename(repo_path, repo_path + ".bak") -+ -+ # replace epel repo with yum source to ensure that epel stabe during migration -+ subprocess.check_output("yum install -y %s" % self.epel_package_name, shell=True) -+ -+ rpm_cmd = [ -+ '/bin/rpm', -+ '-q', -+ self.epel_package_name, -+ '--queryformat', -+ r'%{NAME}|%{VERSION}|%{RELEASE}|%|EPOCH?{%{EPOCH}}:{(none)}||%|PACKAGER?{%{PACKAGER}}:{(none)}||%|' -+ r'ARCH?{%{ARCH}}:{}||%|DSAHEADER?{%{DSAHEADER:pgpsig}}:{%|RSAHEADER?{%{RSAHEADER:pgpsig}}:{(none)}|}|\n' -+ ] -+ try: -+ entries = stdlib.run(rpm_cmd, split=True)['stdout'] -+ -+ # append epel-release entry to RPMs -+ for entry in entries: -+ name, version, release, epoch, packager, arch, pgpsig = entry.split('|') -+ result.items.append(RPM( -+ name=name, -+ version=version, -+ epoch=epoch, -+ packager=packager, -+ arch=arch, -+ release=release, -+ pgpsig=pgpsig, -+ repository='', -+ )) -+ -+ except stdlib.CalledProcessError as err: -+ error = 'Execution of {CMD} returned {RC}. Unable to find installed packages.'.format(CMD=err.command, RC=err.exit_code) -+ stdlib.api.current_logger().error(error) - self.produce(result) --- -2.31.1 - diff --git a/leapp-repository.spec b/leapp-repository.spec index be5bca4..46fed18 100644 --- a/leapp-repository.spec +++ b/leapp-repository.spec @@ -56,7 +56,7 @@ Patch27: 0027-upgrade-write-efi-vars-for-ecs-firmware.patch Patch28: 0028-add-disablerepo-option-to-upgrade-kernel-to-RHCK.patch Patch29: 0029-Service-configuration-remains-after-migration.patch Patch30: 0030-fix-subprocess-check_output-method-for-backup-service-configuration.patch -Patch31: 0031-Deal-with-EPEL-repositories-create-by-user-mannally.patch +#Patch31: 0031-Deal-with-EPEL-repositories-create-by-user-mannally.patch Patch32: 0032-Keep-PermitRootLogin-authentication-behavior-after-m.patch Patch33: 0033-Read-the-driver-list-supported-by-ANCK.patch Patch34: 0034-migrear-grub2-entry-recovery.patch @@ -189,6 +189,7 @@ done; %changelog * Thu Feb 16 2023 Weisson - 0.13.0-2.14 - Add RPMDownloadOrInstallError and its exit code. +- comment patch 0031-Deal-with-EPEL-repositories-create-by-user-mannally.patch * Wed Jan 18 2023 Weisson - 0.13.0-2.13 - Perform system requirements check to ensure migration. -- Gitee