commit: 0579e46fa1937c89cbc69a21a9596dadda5672eb Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org> AuthorDate: Wed Mar 23 16:30:51 2016 +0000 Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org> CommitDate: Wed Mar 23 16:36:45 2016 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=0579e46f
Fix commit 444e50e710f1 where I inaddvertently deleted the wrong paramter during the commit Also change the default (de)compression mode and search order to the non _x variant. catalyst/base/stagebase.py | 2 +- catalyst/defaults.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py index 9d3841c..fe5e6d2 100644 --- a/catalyst/base/stagebase.py +++ b/catalyst/base/stagebase.py @@ -1271,7 +1271,7 @@ class StageBase(TargetBase, ClearBase, GenBase): if not self.compressor: self.compressor = CompressMap(self.settings["compress_definitions"], env=self.env, default_mode=self.settings['compression_mode'], - logger=log) + comp_prog=self.settings['comp_prog']) if "autoresume" in self.settings["options"] \ and self.resume.is_enabled("capture"): diff --git a/catalyst/defaults.py b/catalyst/defaults.py index 8b413f7..5ed19d1 100644 --- a/catalyst/defaults.py +++ b/catalyst/defaults.py @@ -33,10 +33,10 @@ valid_config_file_values.extend([ "distcc", "envscript", confdefaults={ "archdir": "%(PythonDir)s/arch", "comp_prog": COMPRESSOR_PROGRAM_OPTIONS[TAR], - "compression_mode": 'lbzip2_x', + "compression_mode": 'lbzip2', "compressor_arch": None, "compressor_options": XATTRS_OPTIONS[TAR], - "decompressor_search_order": DECOMPRESSOR_XATTR_SEARCH_ORDER, + "decompressor_search_order": DECOMPRESSOR_SEARCH_ORDER, "distdir": "/usr/portage/distfiles", "hash_function": "crc32", "icecream": "/var/cache/icecream",