diff --git a/leapp-0007-remove-failure-exit-code-check.patch b/leapp-0007-remove-failure-exit-code-check.patch new file mode 100644 index 0000000000000000000000000000000000000000..52e8d543cac9591a9e7dafb212e4ab64d5f1cc05 --- /dev/null +++ b/leapp-0007-remove-failure-exit-code-check.patch @@ -0,0 +1,28 @@ +From 28ecb7479355ef533d16c55d06e549dbf4754f2b Mon Sep 17 00:00:00 2001 +From: Weisson +Date: Fri, 23 Dec 2022 15:51:11 +0800 +Subject: [PATCH] [Bugfix] Leapp stops if any exception is thrown, the shortcut + on exit-code check might cause problem. + +Signed-off-by: Weisson +--- + leapp/libraries/common/smc_interface.py | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/leapp/libraries/common/smc_interface.py b/leapp/libraries/common/smc_interface.py +index 62faa9c..d7d3396 100644 +--- a/leapp/libraries/common/smc_interface.py ++++ b/leapp/libraries/common/smc_interface.py +@@ -24,9 +24,6 @@ def update_progress_infomation(progress=None, progress_info=None, err_no=None, e + + state = load_log_status(path) or {"ErrorCode": 0 } + +- if int(state["ErrorCode"]) != 0: +- return +- + if progress is not None: + state["Progress"] = int(progress) + if progress_info is not None: +-- +2.30.1 (Apple Git-130) + diff --git a/leapp.spec b/leapp.spec index e3c811ff84bd7c4020ca8534403c5a1c515d2db7..aeae1019a4b137016e3a4fbb01a7f0629e8ebdaa 100644 --- a/leapp.spec +++ b/leapp.spec @@ -1,4 +1,4 @@ -%define anolis_release .0.6 +%define anolis_release .0.7 # IMPORTANT: this is for the leapp-framework capability (it's not the real # version of the leapp). The capability reflects changes in api and whatever # functionality important from the point of repository. In case of @@ -43,6 +43,7 @@ Patch0003: leapp-0003-add-disablerepo-option-to-upgrade-kernel-to-RHCK.patch Patch0004: leapp-0004-report-a-default-external-link.patch Patch0005: 0005-SMC-progress-indicator.patch Patch0006: leapp-0006-add-customrepo-command.patch +Patch0007: leapp-0007-remove-failure-exit-code-check.patch %if !0%{?fedora} %if %{with python3} @@ -167,6 +168,7 @@ Python 3 leapp framework libraries. %patch0004 -p1 %patch0005 -p1 %patch0006 -p1 +%patch0007 -p1 ################################################## # Build @@ -289,6 +291,9 @@ rm -f %{buildroot}/%{_bindir}/leapp # no files here %changelog +* Fri Dec 23 2022 Weisson - 0.12.0-1.0.7 +- [Bugfix] Leapp stops if any exception is thrown, the shortcut on exit-code check might cause problem. + * Fri Dec 16 2022 Weitao Zhou 0.12.0-1.0.6 - spec: set answer remove_pam_pkcs11 and remove_pam_krb5 as default