!77 [sync] PR-75: 更新热补丁是否可应用的判断条件

From: @openeuler-sync-bot 
Reviewed-by: @Lostwayzxc 
Signed-off-by: @Lostwayzxc

0003-update-condition-under-which-hotpatches-can-be-applied.patch

@@ -0,0 +1,28 @@
+From 30a0f76f2150f27db79fedde3af4926b36954066 Mon Sep 17 00:00:00 2001
+From: rabbitali <shusheng.wen@outlook.com>
+Date: Fri, 30 Jun 2023 19:07:55 +0800
+Subject: [PATCH] Update the condition under which hot patches can be applied
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+---
+ hotpatch/hotpatch_updateinfo.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/hotpatch/hotpatch_updateinfo.py b/hotpatch/hotpatch_updateinfo.py
+index 7dc92ce..3963867 100644
+--- a/hotpatch/hotpatch_updateinfo.py
++++ b/hotpatch/hotpatch_updateinfo.py
+@@ -212,7 +212,7 @@ class HotpatchUpdateInfo(object):
+                     hp_vere = '%s-%s' % (src_pkg_version, src_pkg_release)
+                     if hp_vere != inst_pkg_vere:
+                         continue
+-                    elif self._get_hotpatch_status_in_syscare(hotpatch) == 'ACTIVED':
++                    elif self._get_hotpatch_status_in_syscare(hotpatch) in ('ACTIVED', "ACCEPTED"):
+                         hotpatch.state = self.INSTALLED
+                     else:
+                         hotpatch.state = self.INSTALLABLE
+-- 
+2.33.0
+

aops-apollo.spec

@@ -1,12 +1,14 @@
 Name:		aops-apollo
 Version:	v1.2.2
-Release:	3
+Release:	4
 Summary:	Cve management service, monitor machine vulnerabilities and provide fix functions.
 License:	MulanPSL2
 URL:		https://gitee.com/openeuler/%{name}
 Source0:	%{name}-%{version}.tar.gz
 Patch0001:  0001-fix-issue-gen-cve-task-failed.patch
 Patch0002:  0002-do-not-return-the-related-hotpatches-when-the-cve-is.patch
+Patch0003:  0003-update-condition-under-which-hotpatches-can-be-applied.patch
+
 
 BuildRequires:  python3-setuptools
 Requires:   aops-vulcanus >= v1.2.0
@@ -77,6 +79,9 @@ cp -r hotpatch %{buildroot}/%{python3_sitelib}/dnf-plugins/
 %{python3_sitelib}/aops_apollo_tool/*
 
 %changelog
+* Fri Jun 30 2023 wenxin<shusheng.wen@outlook.com> - v1.2.2-4
+- Update the condition under which hot patches can be applied
+
 * Wed Jun 28 2023 wangguangge<wangguangge@huawei.com> - v1.2.2-3
 - do not return the related hotpatches when the cve is fixed