From cba2b8cf9ed113034b51edee2c64f6754314401e Mon Sep 17 00:00:00 2001 From: Weisson Date: Thu, 16 Feb 2023 15:16:06 +0800 Subject: [PATCH] Add RPMDownloadOrInstallError and its exit code. Signed-off-by: Weisson --- ...loadOrInstallError-and-its-exit-code.patch | 43 +++++++++++++++++++ leapp-repository.spec | 6 ++- 2 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 0037-Add-RPMDownloadOrInstallError-and-its-exit-code.patch diff --git a/0037-Add-RPMDownloadOrInstallError-and-its-exit-code.patch b/0037-Add-RPMDownloadOrInstallError-and-its-exit-code.patch new file mode 100644 index 0000000..7dc4e6e --- /dev/null +++ b/0037-Add-RPMDownloadOrInstallError-and-its-exit-code.patch @@ -0,0 +1,43 @@ +From 56293fcde7534e42dccfae39d5db26f47d5b1f79 Mon Sep 17 00:00:00 2001 +From: Weisson +Date: Thu, 16 Feb 2023 15:12:08 +0800 +Subject: [PATCH] Add RPMDownloadOrInstallError and its exit code. + +Signed-off-by: Weisson +--- + .../el7toel8/actors/dnfpackagedownload/actor.py | 15 +++++++++++---- + 1 file changed, 11 insertions(+), 4 deletions(-) + +diff --git a/repos/system_upgrade/el7toel8/actors/dnfpackagedownload/actor.py b/repos/system_upgrade/el7toel8/actors/dnfpackagedownload/actor.py +index 8e29faa..95c8865 100644 +--- a/repos/system_upgrade/el7toel8/actors/dnfpackagedownload/actor.py ++++ b/repos/system_upgrade/el7toel8/actors/dnfpackagedownload/actor.py +@@ -10,6 +10,10 @@ from leapp.models import ( + XFSPresence, + ) + from leapp.tags import DownloadPhaseTag, IPUWorkflowTag ++from leapp.exceptions import RPMDownloadOrInstallError ++ ++import sys ++import traceback + + + class DnfPackageDownload(Actor): +@@ -43,7 +47,10 @@ class DnfPackageDownload(Actor): + rhui_info = next(self.consume(RHUIInfo), None) + on_aws = bool(rhui_info and rhui_info.provider == 'aws') + +- dnfplugin.perform_rpm_download( +- tasks=tasks, used_repos=used_repos, target_userspace_info=target_userspace_info, +- xfs_info=xfs_info, storage_info=storage_info, plugin_info=plugin_info, on_aws=on_aws +- ) ++ try: ++ dnfplugin.perform_rpm_download( ++ tasks=tasks, used_repos=used_repos, target_userspace_info=target_userspace_info, ++ xfs_info=xfs_info, storage_info=storage_info, plugin_info=plugin_info, on_aws=on_aws ++ ) ++ except Exception as e: ++ raise RPMDownloadOrInstallError(message="fail to download rpm packages.", traceback=''.join(traceback.format_exception(*sys.exc_info()))) +-- +2.30.1 (Apple Git-130) + diff --git a/leapp-repository.spec b/leapp-repository.spec index 0893a3c..be5bca4 100644 --- a/leapp-repository.spec +++ b/leapp-repository.spec @@ -11,7 +11,7 @@ }\ py2_byte_compile "%1" "%2"} -%define anolis_release 13 +%define anolis_release 14 Name: leapp-repository Version: 0.13.0 @@ -62,6 +62,7 @@ Patch33: 0033-Read-the-driver-list-supported-by-ANCK.patch Patch34: 0034-migrear-grub2-entry-recovery.patch Patch35: 0035-GRUB2-EFI-support.patch Patch36: 0036-Perform-system-requirements-check-to-ensure-migratio.patch +Patch37: 0037-Add-RPMDownloadOrInstallError-and-its-exit-code.patch BuildArch: noarch BuildRequires: python-devel @@ -186,6 +187,9 @@ done; # no files here %changelog +* Thu Feb 16 2023 Weisson - 0.13.0-2.14 +- Add RPMDownloadOrInstallError and its exit code. + * Wed Jan 18 2023 Weisson - 0.13.0-2.13 - Perform system requirements check to ensure migration. -- Gitee