diff --git a/0042-Report-inhibitor-message-to-SMC.patch b/0042-Report-inhibitor-message-to-SMC.patch new file mode 100644 index 0000000000000000000000000000000000000000..3868af53ccd3b1ca9753e813aa60e6875d6950d0 --- /dev/null +++ b/0042-Report-inhibitor-message-to-SMC.patch @@ -0,0 +1,37 @@ +From cc157238b9fe439a420db7760749ad985b51c62d Mon Sep 17 00:00:00 2001 +From: wangzhe +Date: Tue, 25 Apr 2023 17:25:49 +0800 +Subject: [PATCH] Report inhibitor message to SMC. + +--- + .../verifycheckresults/libraries/verifycheckresults.py | 13 ++++++++++++- + 1 file changed, 12 insertions(+), 1 deletion(-) + +diff --git a/repos/system_upgrade/el7toel8/actors/verifycheckresults/libraries/verifycheckresults.py b/repos/system_upgrade/el7toel8/actors/verifycheckresults/libraries/verifycheckresults.py +index 63e65e8..4d8cb5d 100644 +--- a/repos/system_upgrade/el7toel8/actors/verifycheckresults/libraries/verifycheckresults.py ++++ b/repos/system_upgrade/el7toel8/actors/verifycheckresults/libraries/verifycheckresults.py +@@ -1,8 +1,19 @@ + from leapp.exceptions import RequestStopAfterPhase + from leapp.libraries.stdlib import api + from leapp.reporting import Report ++from leapp.libraries.common import smc_interface + ++inhibitor_list = [] ++inhibitor_flag = 0 + + def check(): +- if [msg for msg in api.consume(Report) if 'inhibitor' in msg.report.get('flags', [])]: ++ for msg in api.consume(Report): ++ if 'inhibitor' in msg.report.get('flags', []): ++ global inhibitor_flag ++ inhibitor_flag = 1 ++ inhibitor_list.append(str(msg.report.get('title', []))) ++ ++ if inhibitor_flag == 1: ++ # The err_msg length is currently limited to 512, which can be adjusted ++ smc_interface.update_progress_infomation(err_msg="|".join(inhibitor_list)[:512]) + raise RequestStopAfterPhase() +-- +1.8.3.1 + diff --git a/leapp-repository.spec b/leapp-repository.spec index dfd63d096779f71750a38a3fed8c691f1fd207a2..41e9ffe24d021e4a6914e3e18c97a311d78878bd 100644 --- a/leapp-repository.spec +++ b/leapp-repository.spec @@ -11,7 +11,7 @@ }\ py2_byte_compile "%1" "%2"} -%define anolis_release 20 +%define anolis_release 21 Name: leapp-repository Version: 0.13.0 @@ -67,6 +67,7 @@ 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 +Patch42: 0042-Report-inhibitor-message-to-SMC.patch BuildArch: noarch BuildRequires: python-devel @@ -195,6 +196,9 @@ done; # no files here %changelog +* Tue Apr 25 2023 wangzhe - 0.13.0-2.21 +- Report inhibitor message to SMC. + * Wed Apr 12 2023 wangzhe - 0.13.0-2.20 - Add python-devel version check and update. - Fix bug in grub2 version check