update field about cve fix return value
(cherry picked from commit 3687915b3a34a767cef47061b258e2af78a3d952)
This commit is contained in:
parent
089267a4c0
commit
390cd1b351
25
0004-update-field-about-cve-fix-return-value.patch
Normal file
25
0004-update-field-about-cve-fix-return-value.patch
Normal file
@ -0,0 +1,25 @@
|
||||
From 5a5304775690a2e05b138f5ba30dfbb3b00e9ca4 Mon Sep 17 00:00:00 2001
|
||||
From: rabbitali <shusheng.wen@outlook.com>
|
||||
Date: Tue, 5 Sep 2023 17:38:10 +0800
|
||||
Subject: [PATCH 1/1] update field about cve fix return value
|
||||
|
||||
---
|
||||
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 20bfe1e..540f051 100644
|
||||
--- a/ceres/manages/vulnerability_manage.py
|
||||
+++ b/ceres/manages/vulnerability_manage.py
|
||||
@@ -541,7 +541,7 @@ class VulnerabilityManage:
|
||||
)
|
||||
|
||||
result.update({"cves": all_cve_fix_info})
|
||||
- return TaskExecuteRes.SUCCEED if all(all_cve_fix_result) else TaskExecuteRes.FAIL, result
|
||||
+ return SUCCESS if all(all_cve_fix_result) else FAIL, result
|
||||
|
||||
def _update_rpm_by_dnf(self, cve: dict) -> Tuple[str, str]:
|
||||
"""
|
||||
--
|
||||
2.33.0
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
Name: aops-ceres
|
||||
Version: v1.3.0
|
||||
Release: 4
|
||||
Release: 5
|
||||
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}
|
||||
@ -8,6 +8,7 @@ Source0: %{name}-%{version}.tar.gz
|
||||
Patch0001: 0001-fix-bug-repeated-display-of-vulnerabilities.patch
|
||||
Patch0002: 0002-update-query-disk-info-func.patch
|
||||
Patch0003: 0003-adapted-to-cve-rollback-and-update-return-value.patch
|
||||
Patch0004: 0004-update-field-about-cve-fix-return-value.patch
|
||||
|
||||
BuildRequires: python3-setuptools
|
||||
Requires: python3-requests python3-jsonschema python3-libconf
|
||||
@ -42,6 +43,9 @@ An agent which needs to be adopted in client, it managers some plugins, such as
|
||||
|
||||
|
||||
%changelog
|
||||
* Tue Sep 05 2023 wenxin<shusheng.wen@outlook.com> - v1.3.0-5
|
||||
- adapted to cve rollback and update return value
|
||||
|
||||
* Tue Sep 05 2023 wenxin<shusheng.wen@outlook.com> - v1.3.0-4
|
||||
- adapted to cve rollback and update return value
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user