diff --git a/0004-better-hotupgrade-command-output.patch b/0004-better-hotupgrade-command-output.patch new file mode 100644 index 0000000000000000000000000000000000000000..cfcce19b62b19d3203a999a7effc0267db9bb110 --- /dev/null +++ b/0004-better-hotupgrade-command-output.patch @@ -0,0 +1,25 @@ +From a1ccf84bf28323ce613e0c1d1819c31d0d6cd13b Mon Sep 17 00:00:00 2001 +From: zhu-yuncheng +Date: Mon, 27 Mar 2023 23:45:18 +0800 +Subject: [PATCH] better hotupgrade command output + +--- + hotpatch/hot-upgrade.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/hotpatch/hot-upgrade.py b/hotpatch/hot-upgrade.py +index 7a4c3c6..06f32ad 100644 +--- a/hotpatch/hot-upgrade.py ++++ b/hotpatch/hot-upgrade.py +@@ -253,7 +253,7 @@ class HotupgradeCommand(dnf.cli.Command): + cve_hp_dict = updateinfo.get_hotpatches_from_cve(cves) + for cve, hp in cve_hp_dict.items(): + if not hp: +- logger.info(_("The cve doesn't exist: %s"), cve) ++ logger.info(_("The cve's hot patch doesn't exist: %s"), cve) + continue + hp_list += hp + return list(set(hp_list)) +-- +2.30.0 + diff --git a/aops-apollo.spec b/aops-apollo.spec index d9555db4e1e7bdb34c9ac738fc715a6eb63466eb..c903054b7077bf788d9cb2f1aa45af9a7977b2ec 100644 --- a/aops-apollo.spec +++ b/aops-apollo.spec @@ -1,6 +1,6 @@ Name: aops-apollo Version: v1.1.2 -Release: 6 +Release: 7 Summary: Cve management service, monitor machine vulnerabilities and provide fix functions. License: MulanPSL2 URL: https://gitee.com/openeuler/%{name} @@ -8,6 +8,7 @@ Source0: %{name}-%{version}.tar.gz Patch0001: 0001-fix-partial-succeed-bug.patch Patch0002: 0002-add-dnf-hot-patch-list-plugin.patch Patch0003: 0003-add-dnf-hot-upgrade-plugin.patch +Patch0004: 0004-better-hotupgrade-command-output.patch BuildRequires: python3-setuptools Requires: aops-vulcanus >= v1.0.0 @@ -54,6 +55,9 @@ cp -r hotpatch %{buildroot}/%{python3_sitelib}/dnf-plugins/ %changelog +* Mon Mar 27 2023 zhu-yuncheng - v1.1.2-7 +- better hotupgrade command output when cve exists but hot patch doesn't + * Sat Mar 25 2023 wangguangge - v1.1.2-6 - fix baseclass.py bug and add syscare require in spec