!125 [sync] PR-122: 修正gen_updateinfo.py中生成filename错误问题

From: @openeuler-sync-bot 
Reviewed-by: @zhu-yuncheng 
Signed-off-by: @zhu-yuncheng
This commit is contained in:
openeuler-ci-bot 2023-11-21 12:24:32 +00:00 committed by Gitee
commit 43b806100b
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 31 additions and 2 deletions

View File

@ -0,0 +1,26 @@
From 175d79fa735de0ac315c1c9b3893ff850a478b38 Mon Sep 17 00:00:00 2001
From: wang-guangge <wangguangge@huawei.com>
Date: Tue, 14 Nov 2023 15:03:21 +0800
Subject: [PATCH] fix filename bug in gen_updateinfo.py
---
aops-apollo-tool/aops_apollo_tool/gen_updateinfo.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/aops-apollo-tool/aops_apollo_tool/gen_updateinfo.py b/aops-apollo-tool/aops_apollo_tool/gen_updateinfo.py
index 26d0704..5785c7c 100644
--- a/aops-apollo-tool/aops_apollo_tool/gen_updateinfo.py
+++ b/aops-apollo-tool/aops_apollo_tool/gen_updateinfo.py
@@ -144,8 +144,8 @@ def generate_package_list(package_dir: str) -> Element:
filename.text = "%s-%s-%s.%s.rpm" % (
package.attrib['name'],
- package.attrib['release'],
package.attrib['version'],
+ package.attrib['release'],
package.attrib['arch'],
)
--
2.27.0

View File

@ -1,6 +1,6 @@
Name: aops-apollo
Version: v1.3.4
Release: 9
Release: 10
Summary: Cve management service, monitor machine vulnerabilities and provide fix functions.
License: MulanPSL2
URL: https://gitee.com/openeuler/%{name}
@ -13,7 +13,7 @@ Patch0005: 0005-fix-the-severity-field-filtering-error.patch
Patch0006: 0006-fix-cve-list-by-host-count.patch
Patch0007: 0007-fix-data-correction-task-execution-error.patch
Patch0008: 0008-update-apollo-database-proxy-host.py.patch
Patch0009: 0009-fix-filename-bug-in-gen_updateinfo.py.patch
BuildRequires: python3-setuptools
Requires: aops-vulcanus >= v1.3.0
@ -76,6 +76,9 @@ popd
%{python3_sitelib}/aops_apollo_tool/*
%changelog
* Tue Nov 14 2023 wangguangge<wangguangge@huawei.com> - v1.3.4-10
- fix filename bug in aops-apollo-tool
* Mon Nov 13 2023 wenxin<wenxin32@foxmail.com> - v1.3.4-9
- Update the installation dependencies