diff --git a/.gitignore b/.gitignore index 5a4daaf..dd0c19f 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /sos-4.7.2.tar.gz /sos-4.8.0.tar.gz /sos-4.8.1.tar.gz +/sos-4.8.2.tar.gz diff --git a/sos-python36-walrus-operator.patch b/sos-python36-walrus-operator.patch new file mode 100644 index 0000000..6ebe35c --- /dev/null +++ b/sos-python36-walrus-operator.patch @@ -0,0 +1,25 @@ +--- a/sos/report/plugins/coredump.py ++++ b/sos/report/plugins/coredump.py +@@ -72,8 +72,8 @@ + cdump = line.split() + pid = cdump[4] + exe = cdump[-2] +- if regex := self.get_option("executable"): +- if not re.search(regex, exe, re.I): ++ if self.get_option("executable"): ++ if not re.search(self.get_option("executable"), exe, re.I): + continue + cinfo = self.collect_cmd_output(f"coredumpctl info {pid}") + if cinfo['status'] != 0: +--- a/sos/collector/sosnode.py ++++ b/sos/collector/sosnode.py +@@ -372,7 +372,8 @@ + for line in result.splitlines(): + if not is_list: + try: +- if ls := line.split(): ++ ls = line.split() ++ if ls: + res.append(ls[0]) + except Exception as err: + self.log_debug(f"Error parsing sos help: {err}") diff --git a/sos.spec b/sos.spec index d3b35f2..56187da 100644 --- a/sos.spec +++ b/sos.spec @@ -4,7 +4,7 @@ Summary: A set of tools to gather troubleshooting information from a system Name: sos -Version: 4.8.1 +Version: 4.8.2 Release: 1%{?dist} Group: Applications/System Source0: https://github.com/sosreport/sos/archive/%{version}/sos-%{version}.tar.gz @@ -22,6 +22,7 @@ Recommends: python3-pexpect Recommends: python3-pyyaml Conflicts: vdsm < 4.40 Obsoletes: sos-collector +Patch1: sos-python36-walrus-operator.patch %description Sos is a set of tools that gathers information about system @@ -32,6 +33,7 @@ support technicians and developers. %prep %setup -qn %{name}-%{version} %setup -T -D -a1 -q +%patch -P 1 -p1 %build %py3_build @@ -104,6 +106,10 @@ of the system. Currently storage and filesystem commands are audited. %ghost /etc/audit/rules.d/40-sos-storage.rules %changelog +* Tue Jan 07 2025 Jan Jansky = 4.8.2-1 +- Update to 4.8.2 in RHEL 8 + Resolves: RHEL-72941 + * Wed Oct 23 2024 Jan Jansky = 4.8.1-1 - Update to 4.8.1 in RHEL 8 Resolves: RHEL-64160 diff --git a/sources b/sources index c1196a8..0a334af 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (sos-4.8.1.tar.gz) = c75d5a891c0dd48d2cf511f39dc25a71b65e9daf965d9c1be7ace94f957ec62543fa0c8d1cc700b557920ee581eacce9cf1d8520d5401396aba323dee131e633 +SHA512 (sos-4.8.2.tar.gz) = 1050f35e90723252821a7fe02d506f5a5a6c21a2f91fef80443d719b4dbb26563a761d1fb84cf40a19eeb267e1c1500514f21a8d0b5513db52d5ff0019ea32d8 SHA512 (sos-audit-0.3.tgz) = 32597baf6350804d08179a0dbe48470a93df148e83d2e49bb3288f6bcc2d151bb1433761913bfbccd912c14de92435939fef5bcd7e091dfe33a345d61ea842ea