packages/aops-ceres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix issue: cve fix result doesn't match log

Browse Source 
(cherry picked from commit 1d5daceae300fa28cfe72f10f865b8aeb06d6248)
This commit is contained in:
rabbitali 2023-06-09 17:29:25 +08:00 committed by openeuler-sync-bot
parent bdf152772e
commit 61049736d9
2 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
0003-fix-issue-cve-fix-result-doesn-t-match-log.patch Normal file
View File

@ -0,0 +1,24 @@
From 0aad5ad09a5860bb43a9a64337cefe5813424288 Mon Sep 17 00:00:00 2001
From: rabbitali <shusheng.wen@outlook.com>
Date: Fri, 9 Jun 2023 15:42:42 +0800
Subject: [PATCH] fix issue: cve fix result doesn't match log
---
ceres/manages/vulnerability_manage.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ceres/manages/vulnerability_manage.py b/ceres/manages/vulnerability_manage.py
index a395620..c153190 100644
--- a/ceres/manages/vulnerability_manage.py
+++ b/ceres/manages/vulnerability_manage.py
@@ -298,7 +298,7 @@ class VulnerabilityManage:
syscare_res = self._syscare_change_status(hot_pkg, cve.get('accepted'))
if not syscare_res:
return False, res
- return "Active/Accept hot patch succeed" in res or "No hot patches marked for install" in res, res
+ return "Apply hot patch succeed" in res or "No hot patches marked for install" in res, res
else:
return "Complete" in res, res
--

6
aops-ceres.spec
View File

@ -1,12 +1,13 @@
Name: aops-ceres
Version: v1.2.1
Release: 3
Release: 4
Summary: An agent which needs to be adopted in client, it managers some plugins, such as gala-gopher(kpi collection), fluentd(log collection) and so on.
License: MulanPSL2
URL: https://gitee.com/openeuler/%{name}
Source0: %{name}-%{version}.tar.gz
Patch0001: 0001-modify-return-value-when-no-hotpatch-is-matched.patch
Patch0002: 0002-update-cve-fix-and-cve-scan.patch
Patch0003: 0003-fix-issue-cve-fix-result-doesn-t-match-log.patch
BuildRequires: python3-setuptools
@ -42,6 +43,9 @@ An agent which needs to be adopted in client, it managers some plugins, such as
%changelog
* Fri Jun 09 2023 wenxin<shusheng.wen@outlook.com> - v1.2.1-4
- fix issue: cve fix result doesn't match log
* Fri Jun 02 2023 wenxin<shusheng.wen@outlook.com> - v1.2.1-3
- update cve scan and cve fix