You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
31 lines
1.1 KiB
31 lines
1.1 KiB
7 months ago
|
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):
|