diff options
| author | Anubhav Shelat <ashelat@redhat.com> | 2023-06-13 14:08:30 -0400 |
|---|---|---|
| committer | John Kacur <jkacur@redhat.com> | 2023-06-21 17:17:36 -0400 |
| commit | 546c1811f42ef1019e65789d3c6696a7e6c2f3f0 (patch) | |
| tree | 5f56e6def9e55bc09d0b7513bd6c639dd971da7e | |
| parent | adc41fa998fc15dff2c5edf3f57e6cd0970e17e5 (diff) | |
| download | rteval-546c1811f42ef1019e65789d3c6696a7e6c2f3f0.tar.gz | |
rteval: osinfo.py: Added code to use 'sos report' instead of sosreport.
sosreport is deprecated, so if available on the system osinfo will try
to use the sos command instead.
Signed-off-by: Anubhav Shelat <ashelat@redhat.com>
Signed-off-by: John Kacur <jkacur@redhat.com>
| -rw-r--r-- | rteval/sysinfo/osinfo.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/rteval/sysinfo/osinfo.py b/rteval/sysinfo/osinfo.py index 83dc78b..0c570c0 100644 --- a/rteval/sysinfo/osinfo.py +++ b/rteval/sysinfo/osinfo.py @@ -62,12 +62,14 @@ class OSInfo: def run_sysreport(self, repdir): - if os.path.exists('/usr/sbin/sosreport'): + if os.path.exists('/usr/sbin/sos'): + exe = '/usr/sbin/sos report' + elif os.path.exists('/usr/sbin/sosreport'): exe = '/usr/sbin/sosreport' elif os.path.exists('/usr/sbin/sysreport'): exe = '/usr/sbin/sysreport' else: - raise RuntimeError("Can't find sosreport/sysreport") + raise RuntimeError("Can't find sos/sosreport/sysreport") self.__logger.log(Log.DEBUG, f"report tool: {exe}") options = ['-k', 'rpm.rpmva=off', @@ -75,8 +77,8 @@ class OSInfo: '--batch'] self.__logger.log(Log.INFO, "Generating SOS report") - self.__logger.log(Log.INFO, f"using command {' '.join([exe]+options)}") - subprocess.call([exe] + options) + self.__logger.log(Log.INFO, f"using command {' '.join(exe.split()+options)}") + subprocess.call(exe.split() + options) for s in glob('/tmp/s?sreport-rteval-*'): self.__logger.log(Log.DEBUG, f"moving {s} to {repdir}") shutil.move(s, repdir) |