From db3eb369aded2439141471e35d701e5226ab116b Mon Sep 17 00:00:00 2001 From: wang-guangge Date: Tue, 14 Nov 2023 16:41:02 +0800 Subject: [PATCH] fix filename bug in aops-apollo-tool (cherry picked from commit 33b7ff0eed9fefaffaa8c8e1eb48512b11d95c73) --- ...ix-filename-bug-in-gen_updateinfo.py.patch | 26 +++++++++++++++++++ aops-apollo.spec | 7 +++-- 2 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 0009-fix-filename-bug-in-gen_updateinfo.py.patch diff --git a/0009-fix-filename-bug-in-gen_updateinfo.py.patch b/0009-fix-filename-bug-in-gen_updateinfo.py.patch new file mode 100644 index 0000000..e53cf63 --- /dev/null +++ b/0009-fix-filename-bug-in-gen_updateinfo.py.patch @@ -0,0 +1,26 @@ +From 175d79fa735de0ac315c1c9b3893ff850a478b38 Mon Sep 17 00:00:00 2001 +From: wang-guangge +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 + diff --git a/aops-apollo.spec b/aops-apollo.spec index 8c5361e..234daca 100644 --- a/aops-apollo.spec +++ b/aops-apollo.spec @@ -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 - v1.3.4-10 +- fix filename bug in aops-apollo-tool + * Mon Nov 13 2023 wenxin - v1.3.4-9 - Update the installation dependencies -- Gitee