!141 [sync] PR-140: update to version v1.4.1

From: @openeuler-sync-bot 
Reviewed-by: @Lostwayzxc 
Signed-off-by: @Lostwayzxc
This commit is contained in:
openeuler-ci-bot 2023-12-18 03:04:32 +00:00 committed by Gitee
commit 1bdae04cc4
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
4 changed files with 7 additions and 32 deletions

View File

@ -1,29 +0,0 @@
From 75fec4829ff33c6e0b6e306bb3b730a7527fd352 Mon Sep 17 00:00:00 2001
From: rabbitali <wenxin32@foxmail.com>
Date: Tue, 12 Dec 2023 11:04:06 +0800
Subject: [PATCH 1/1] fix unboundlocalerror with variable name log
---
ceres/manages/vulnerability_manage.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/ceres/manages/vulnerability_manage.py b/ceres/manages/vulnerability_manage.py
index 0b6fb88..038c68d 100644
--- a/ceres/manages/vulnerability_manage.py
+++ b/ceres/manages/vulnerability_manage.py
@@ -664,10 +664,10 @@ class VulnerabilityManage:
try:
hotpatch_name = rpm.rsplit(".", 1)[0].split("-", 1)[1]
_, hotpatch_status_set_log = self._set_hotpatch_status_by_dnf_plugin(hotpatch_name, "accept")
- log += f"\n\n{hotpatch_status_set_log}"
+ tmp["log"] += f"\n\n{hotpatch_status_set_log}"
except IndexError as error:
LOGGER.error(error)
- log += f"\n\nhotpatch status set failed due to can't get correct hotpatch name!"
+ tmp["log"] += f"\n\nhotpatch status set failed due to can't get correct hotpatch name!"
package_update_info.append(tmp)
return final_fix_result, package_update_info, upgrade_count
--
2.33.0

Binary file not shown.

BIN
aops-ceres-v1.4.1.tar.gz Normal file

Binary file not shown.

View File

@ -1,13 +1,12 @@
%define datool_with_testing 0
Name: aops-ceres
Version: v1.4.0
Release: 2
Version: v1.4.1
Release: 1
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-fix-unboundlocalerror-with-variable-name-log.patch
BuildRequires: python3-setuptools
Requires: python3-requests python3-jsonschema python3-libconf
@ -87,6 +86,11 @@ install -b -m500 ./extra-tools/da-tool/script/da-tool.sh ${RPM_BUILD_ROOT}
%attr(0500, root, root) %{_bindir}/da-tool-analysis
%changelog
* Mon Dec 18 2023 wangguangge<wangguangge@huawei.com> - v1.4.1-1
- update to v1.4.1
- update cve fix logic
- support rollback operation for kernel hotpatch/coldpatch
* Tue Dec 12 2023 wenxin<wenxin32@foxmail.com> - v1.4.0-2
- fix unboundlocalerror with variable name log