From 33503207597401252e3e88bf846605637d03b8f1 Mon Sep 17 00:00:00 2001 From: Pierguido Lambri Date: Tue, 30 Jul 2024 08:42:50 +0100 Subject: [PATCH] Fix sources link The previous commit 2a8c322b didn't have all the required changes like sources. This should align everything up. Resolves: RHEL-49779 Signed-off-by: Pierguido Lambri --- .gitignore | 1 + sos-RHEL-35945-sos-clean-on-archive.patch | 30 ----------------------- sources | 2 +- 3 files changed, 2 insertions(+), 31 deletions(-) delete mode 100644 sos-RHEL-35945-sos-clean-on-archive.patch diff --git a/.gitignore b/.gitignore index 8768b4d..b0e9a01 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /sos-4.6.1.tar.gz /sos-4.7.0.tar.gz /sos-4.7.1.tar.gz +/sos-4.7.2.tar.gz diff --git a/sos-RHEL-35945-sos-clean-on-archive.patch b/sos-RHEL-35945-sos-clean-on-archive.patch deleted file mode 100644 index ddfeaca..0000000 --- a/sos-RHEL-35945-sos-clean-on-archive.patch +++ /dev/null @@ -1,30 +0,0 @@ -From a0c2586e230c9600d3d3f70ab89c9f6eb52ed3ed Mon Sep 17 00:00:00 2001 -From: Pavel Moravec -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 ---- - 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): diff --git a/sources b/sources index 13443da..47fffc0 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (sos-4.7.1.tar.gz) = 25a99382d2f6b084a9de7331a99d176e4ef22875f58253183db2874c738506e7b9709f5db119cdfb7fc5ec4e5c2a0f1f7f3cd7ff0aec35b87cff957200af6d98 +SHA512 (sos-4.7.2.tar.gz) = 00124fcd1b14a16213ddd53da9686c4efcb773321e5e6e4a2c883bbe71e8ea200055134404942140a55bd94a3aeec272c5bc296f73b5bf16c7194955442e40e6 SHA512 (sos-audit-0.3.tgz) = 32597baf6350804d08179a0dbe48470a93df148e83d2e49bb3288f6bcc2d151bb1433761913bfbccd912c14de92435939fef5bcd7e091dfe33a345d61ea842ea