|
 |
0cd6dc |
From 081e1ce9f9ad7570d057babd81b474fd407149d7 Mon Sep 17 00:00:00 2001
|
|
|
0cd6dc |
From: "Bryn M. Reeves" <bmr@redhat.com>
|
|
|
0cd6dc |
Date: Tue, 9 Dec 2014 17:32:45 +0000
|
|
|
0cd6dc |
Subject: [PATCH 22/93] [sosreport] disable the 'zip' compression type
|
|
|
0cd6dc |
|
|
|
0cd6dc |
The Zip archive format is little used and has been broken for
|
|
|
0cd6dc |
some time:
|
|
|
0cd6dc |
|
|
|
0cd6dc |
Unexpected exception setting up archive:
|
|
|
0cd6dc |
Traceback (most recent call last):
|
|
|
0cd6dc |
File "/usr/lib/python2.7/site-packages/sos/sosreport.py", line 1092, in prework
|
|
|
0cd6dc |
self._set_archive()
|
|
|
0cd6dc |
File "/usr/lib/python2.7/site-packages/sos/sosreport.py", line 679, in _set_archive
|
|
|
0cd6dc |
self.archive = ZipFileArchive(archive_name, self.tmpdir)
|
|
|
0cd6dc |
TypeError: __init__() takes exactly 2 arguments (3 given)
|
|
|
0cd6dc |
__init__() takes exactly 2 arguments (3 given)
|
|
|
0cd6dc |
|
|
|
0cd6dc |
Remove it from the allowed options list for --compression-type.
|
|
|
0cd6dc |
|
|
|
0cd6dc |
The supporting Archive classes can be removed in a separate commit.
|
|
|
0cd6dc |
|
|
|
0cd6dc |
Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
|
|
|
0cd6dc |
---
|
|
|
0cd6dc |
sos/sosreport.py | 6 ++----
|
|
|
0cd6dc |
1 file changed, 2 insertions(+), 4 deletions(-)
|
|
|
0cd6dc |
|
|
|
0cd6dc |
diff --git a/sos/sosreport.py b/sos/sosreport.py
|
|
|
0cd6dc |
index 99b5f47..a697380 100644
|
|
|
0cd6dc |
--- a/sos/sosreport.py
|
|
|
0cd6dc |
+++ b/sos/sosreport.py
|
|
|
0cd6dc |
@@ -599,7 +599,7 @@ class SoSOptions(object):
|
|
|
0cd6dc |
dest="report",
|
|
|
0cd6dc |
help="Disable HTML/XML reporting", default=False)
|
|
|
0cd6dc |
parser.add_option("-z", "--compression-type", dest="compression_type",
|
|
|
0cd6dc |
- help="compression technology to use [auto, zip, "
|
|
|
0cd6dc |
+ help="compression technology to use [auto, "
|
|
|
0cd6dc |
"gzip, bzip2, xz] (default=auto)",
|
|
|
0cd6dc |
default="auto")
|
|
|
0cd6dc |
|
|
|
0cd6dc |
@@ -675,8 +675,6 @@ class SoSReport(object):
|
|
|
0cd6dc |
if self.opts.compression_type == 'auto':
|
|
|
0cd6dc |
auto_archive = self.policy.get_preferred_archive()
|
|
|
0cd6dc |
self.archive = auto_archive(archive_name, self.tmpdir)
|
|
|
0cd6dc |
- elif self.opts.compression_type == 'zip':
|
|
|
0cd6dc |
- self.archive = ZipFileArchive(archive_name, self.tmpdir)
|
|
|
0cd6dc |
else:
|
|
|
0cd6dc |
self.archive = TarFileArchive(archive_name, self.tmpdir)
|
|
|
0cd6dc |
self.archive.set_debug(True if self.opts.debug else False)
|
|
|
0cd6dc |
@@ -1080,7 +1078,7 @@ class SoSReport(object):
|
|
|
0cd6dc |
self.policy.pre_work()
|
|
|
0cd6dc |
try:
|
|
|
0cd6dc |
self.ui_log.info(_(" Setting up archive ..."))
|
|
|
0cd6dc |
- compression_methods = ('auto', 'zip', 'bzip2', 'gzip', 'xz')
|
|
|
0cd6dc |
+ compression_methods = ('auto', 'bzip2', 'gzip', 'xz')
|
|
|
0cd6dc |
method = self.opts.compression_type
|
|
|
0cd6dc |
if method not in compression_methods:
|
|
|
0cd6dc |
compression_list = ', '.join(compression_methods)
|
|
|
0cd6dc |
--
|
|
|
0cd6dc |
1.9.3
|
|
|
0cd6dc |
|