c261d895e5
Convert base64 data to text before wrapping. Add sysreport to gating tests and check the exit status. Resolves: RHEL-44437 Signed-off-by: Anubhav Shelat <ashelat@redhat.com>
43 lines
1.4 KiB
Diff
43 lines
1.4 KiB
Diff
From 2a0b5833be4f55dbbc00f1835a4ace554e498137 Mon Sep 17 00:00:00 2001
|
|
From: John Kacur <jkacur@redhat.com>
|
|
Date: Fri, 21 Jun 2024 13:20:26 -0400
|
|
Subject: [PATCH] rteval: Fix sysreport traceback when utility sos not found
|
|
|
|
When rteval is run with
|
|
-s, --sysreport run sysreport to collect system data (default: False)
|
|
|
|
and sos, sosreport or sysreport cannot be found then rteval exits with
|
|
an error.
|
|
|
|
Fix this by adding /usr/bin to the places to search for this program.
|
|
|
|
Signed-off-by: John Kacur <jkacur@redhat.com>
|
|
---
|
|
rteval/sysinfo/osinfo.py | 6 ++++++
|
|
1 file changed, 6 insertions(+)
|
|
|
|
diff --git a/rteval/sysinfo/osinfo.py b/rteval/sysinfo/osinfo.py
|
|
index 3d6d5f8daa96..3bdbcc81e068 100644
|
|
--- a/rteval/sysinfo/osinfo.py
|
|
+++ b/rteval/sysinfo/osinfo.py
|
|
@@ -45,10 +45,16 @@ class OSInfo:
|
|
def run_sysreport(self, repdir):
|
|
if os.path.exists('/usr/sbin/sos'):
|
|
exe = '/usr/sbin/sos report'
|
|
+ elif os.path.exists('/usr/bin/sos'):
|
|
+ exe = '/usr/bin/sos report'
|
|
elif os.path.exists('/usr/sbin/sosreport'):
|
|
exe = '/usr/sbin/sosreport'
|
|
+ elif os.path.exists('/usr/bin/sosreport'):
|
|
+ exe = '/usr/bin/sosreport'
|
|
elif os.path.exists('/usr/sbin/sysreport'):
|
|
exe = '/usr/sbin/sysreport'
|
|
+ elif os.path.exists('/usr/bin/sysreport'):
|
|
+ exe = '/usr/bin/sysreport'
|
|
else:
|
|
raise RuntimeError("Can't find sos/sosreport/sysreport")
|
|
|
|
--
|
|
2.45.2
|
|
|