sos updates to 9.4 / 9.3.z
Resolves: RHEL-35945 Signed-off-by: Pavel Moravec <pmoravec@redhat.com>
This commit is contained in:
parent
d3a2331dab
commit
41dbf556d3
30
sos-RHEL-35945-sos-clean-on-archive.patch
Normal file
30
sos-RHEL-35945-sos-clean-on-archive.patch
Normal file
@ -0,0 +1,30 @@
|
|||||||
|
From a0c2586e230c9600d3d3f70ab89c9f6eb52ed3ed Mon Sep 17 00:00:00 2001
|
||||||
|
From: Pavel Moravec <pmoravec@redhat.com>
|
||||||
|
Date: Tue, 23 Apr 2024 11:00:11 +0200
|
||||||
|
Subject: [PATCH] [archive] Fix get_archive_root after files reordering
|
||||||
|
|
||||||
|
Commit d5d8c21 reordered files in the archive, such that the first
|
||||||
|
member is not the archive root directory further more. Let change the
|
||||||
|
get_archive_root method accordingly to prevent self.archive_root being
|
||||||
|
empty.
|
||||||
|
|
||||||
|
Resolves: #3616
|
||||||
|
|
||||||
|
Signed-off-by: Pavel Moravec <pmoravec@redhat.com>
|
||||||
|
---
|
||||||
|
sos/cleaner/archives/__init__.py | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/sos/cleaner/archives/__init__.py b/sos/cleaner/archives/__init__.py
|
||||||
|
index f7c5eb587..0fa1ef43f 100644
|
||||||
|
--- a/sos/cleaner/archives/__init__.py
|
||||||
|
+++ b/sos/cleaner/archives/__init__.py
|
||||||
|
@@ -104,7 +104,7 @@ def get_archive_root(self):
|
||||||
|
if toplevel.isdir():
|
||||||
|
return toplevel.name
|
||||||
|
else:
|
||||||
|
- return os.sep
|
||||||
|
+ return os.path.dirname(toplevel.name) or os.sep
|
||||||
|
return os.path.abspath(self.archive_path)
|
||||||
|
|
||||||
|
def report_msg(self, msg):
|
8
sos.spec
8
sos.spec
@ -5,7 +5,7 @@
|
|||||||
Summary: A set of tools to gather troubleshooting information from a system
|
Summary: A set of tools to gather troubleshooting information from a system
|
||||||
Name: sos
|
Name: sos
|
||||||
Version: 4.7.1
|
Version: 4.7.1
|
||||||
Release: 1%{?dist}
|
Release: 3%{?dist}
|
||||||
Group: Applications/System
|
Group: Applications/System
|
||||||
Source0: https://github.com/sosreport/sos/archive/%{version}/sos-%{version}.tar.gz
|
Source0: https://github.com/sosreport/sos/archive/%{version}/sos-%{version}.tar.gz
|
||||||
Source1: sos-audit-%{auditversion}.tgz
|
Source1: sos-audit-%{auditversion}.tgz
|
||||||
@ -22,6 +22,7 @@ Recommends: python3-pexpect
|
|||||||
Recommends: python3-pyyaml
|
Recommends: python3-pyyaml
|
||||||
Conflicts: vdsm < 4.40
|
Conflicts: vdsm < 4.40
|
||||||
Obsoletes: sos-collector <= 1.9
|
Obsoletes: sos-collector <= 1.9
|
||||||
|
Patch1: sos-RHEL-35945-sos-clean-on-archive.patch
|
||||||
|
|
||||||
%description
|
%description
|
||||||
Sos is a set of tools that gathers information about system
|
Sos is a set of tools that gathers information about system
|
||||||
@ -32,6 +33,7 @@ support technicians and developers.
|
|||||||
%prep
|
%prep
|
||||||
%setup -qn %{name}-%{version}
|
%setup -qn %{name}-%{version}
|
||||||
%setup -T -D -a1 -q
|
%setup -T -D -a1 -q
|
||||||
|
%patch1 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%py3_build
|
%py3_build
|
||||||
@ -104,6 +106,10 @@ of the system. Currently storage and filesystem commands are audited.
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu May 09 2024 Pavel Moravec <pmoravec@redhat.com> = 4.7.1-3
|
||||||
|
- [archive] Fix get_archive_root after files reordering
|
||||||
|
Resolves: RHEL-35945
|
||||||
|
|
||||||
* Mon Apr 08 2024 Jan Jansky <jjansky@redhat.com> = 4.7.1-1
|
* Mon Apr 08 2024 Jan Jansky <jjansky@redhat.com> = 4.7.1-1
|
||||||
- rebase to upstream 4.7.1
|
- rebase to upstream 4.7.1
|
||||||
Resolves: RHEL-32106
|
Resolves: RHEL-32106
|
||||||
|
Loading…
Reference in New Issue
Block a user