From 5fb66e228f3e511cb319567d774539af7f962d91 Mon Sep 17 00:00:00 2001 From: zhuofeng <1107893276@qq.com> Date: Wed, 12 Mar 2025 06:35:27 +0000 Subject: [PATCH] fix an issue with printing error Signed-off-by: zhuofeng <1107893276@qq.com> --- fix-an-issue-with-printing-error.patch | 26 ++++++++++++++++++++++++++ sysSentry.spec | 9 ++++++++- 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 fix-an-issue-with-printing-error.patch diff --git a/fix-an-issue-with-printing-error.patch b/fix-an-issue-with-printing-error.patch new file mode 100644 index 0000000..9877a51 --- /dev/null +++ b/fix-an-issue-with-printing-error.patch @@ -0,0 +1,26 @@ +From 98852da140c536ef41f801f61430130d28eba3d2 Mon Sep 17 00:00:00 2001 +From: zhuofeng <1107893276@qq.com> +Date: Wed, 12 Mar 2025 02:48:26 +0000 +Subject: [PATCH] fix an issue with printing error + +Signed-off-by: zhuofeng <1107893276@qq.com> +--- + src/services/syssentry/global_values.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/services/syssentry/global_values.py b/src/services/syssentry/global_values.py +index a6da9e3..931b8ab 100644 +--- a/src/services/syssentry/global_values.py ++++ b/src/services/syssentry/global_values.py +@@ -116,7 +116,7 @@ class InspectTask: + try: + child = subprocess.Popen(cmd_list, stdout=logfile, stderr=subprocess.STDOUT, close_fds=True, env=self.environ_conf) + except OSError: +- logging.error("task %s start Popen error, invalid cmd") ++ logging.error("task %s start Popen error, invalid cmd", cmd_list) + self.result_info["result"] = ResultLevel.FAIL.name + self.result_info["error_msg"] = RESULT_LEVEL_ERR_MSG_DICT.get(ResultLevel.FAIL.name) + self.runtime_status = "FAILED" +-- +2.43.0 + diff --git a/sysSentry.spec b/sysSentry.spec index 4c4c494..9bf2f8e 100644 --- a/sysSentry.spec +++ b/sysSentry.spec @@ -4,7 +4,7 @@ Summary: System Inspection Framework Name: sysSentry Version: 1.0.3 -Release: 8 +Release: 9 License: Mulan PSL v2 Group: System Environment/Daemons Source0: https://gitee.com/openeuler/sysSentry/releases/download/v%{version}/%{name}-%{version}.tar.gz @@ -16,6 +16,7 @@ Patch4: fix-xalarm-log-not-print-and-add-on-iter-problem.patch Patch5: add-new-func-for-ebpf-in-the-rq_driver-stage.patch Patch6: fix-the-sentryCollector-service-can-t-be-stopped-for.patch Patch7: add-dfx-for-xalarmd-to-rebuild-connection-after-comm.patch +Patch8: fix-an-issue-with-printing-error.patch BuildRequires: cmake gcc-c++ BuildRequires: python3 python3-setuptools @@ -212,6 +213,12 @@ rm -rf /var/run/sysSentry | : %attr(0550,root,root) %{python3_sitelib}/syssentry/bmc_alarm.py %changelog +* Wed Mar 12 2025 zhuofeng - 1.0.3-9 +- Type:bugfix +- CVE:NA +- SUG:NA +- DESC: fix an issue with printing error + * Fri Feb 28 2025 caixiaomeng - 1.0.3-8 - Type:bugfix - CVE:NA -- Gitee