aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBryn M. Reeves <bmr@redhat.com>2013-06-10 17:36:55 +0100
committerBryn M. Reeves <bmr@redhat.com>2013-06-10 17:36:55 +0100
commit6a10d87299b6575c8786775002858db6042a7572 (patch)
tree9ee52b9603ae7c80d3a8a68b736e8bc56d6ebb26
parenta9eadf941446ae518067aad50bc3fe5539238ccd (diff)
downloadsos-6a10d87299b6575c8786775002858db6042a7572.tar.gz
Revert use of PAX archives
Revert the use of POSIX PAX archive format in TarFileArchive. The code to capture SELinux file contexts is currently disabled in master due to the undesirable affects on archive extraction. Since this is the main reason for using the PAX format revert to automatic format selection to allow the widest compatibility. Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
-rw-r--r--sos/archive.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/sos/archive.py b/sos/archive.py
index 1dfea24e..3fbd7bf8 100644
--- a/sos/archive.py
+++ b/sos/archive.py
@@ -216,8 +216,7 @@ class TarFileArchive(FileCacheArchive):
def _build_archive(self):
old_pwd = os.getcwd()
os.chdir(self._tmp_dir)
- tar = tarfile.open(self._archive_path,
- mode="w", format=tarfile.PAX_FORMAT)
+ tar = tarfile.open(self._archive_path, mode="w")
tar.add(os.path.split(self._name)[1], filter=self.copy_permissions_filter)
tar.close()
os.chdir(old_pwd)