aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Dolbec <dolsen@gentoo.org>2016-03-23 13:02:11 -0700
committerBrian Dolbec <dolsen@gentoo.org>2016-03-23 13:02:11 -0700
commit966bff4dae7ed88aa807282ae299c3c0da1f966d (patch)
treed7efd400e58c28af39679536e9d94ca33938eacb /catalyst/defaults.py
parentFix commit 444e50e710f1 where I inaddvertently deleted the wrong paramter du... (diff)
downloadcatalyst-966bff4dae7ed88aa807282ae299c3c0da1f966d.tar.gz
catalyst-966bff4dae7ed88aa807282ae299c3c0da1f966d.tar.bz2
catalyst-966bff4dae7ed88aa807282ae299c3c0da1f966d.zip
catalyst: Apply patches from Yuta for additional needed bsd changes bug 574422
I did do some editing of his changes. Original author: Yuta Satoh X-Gentoo-bug: 574422 X-Gentoo-bug-url: https://bugs.gentoo.org/show_bug.cgi?id=574422
Diffstat (limited to 'catalyst/defaults.py')
-rw-r--r--catalyst/defaults.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/catalyst/defaults.py b/catalyst/defaults.py
index 5ed19d14..0bba6f4d 100644
--- a/catalyst/defaults.py
+++ b/catalyst/defaults.py
@@ -1,8 +1,9 @@
import os
-from DeComp.definitions import DECOMPRESSOR_XATTR_SEARCH_ORDER
+from DeComp.definitions import DECOMPRESSOR_SEARCH_ORDER
from DeComp.definitions import COMPRESSOR_PROGRAM_OPTIONS, XATTRS_OPTIONS
+from DeComp.definitions import DECOMPRESSOR_PROGRAM_OPTIONS, LIST_XATTRS_OPTIONS
# Used for the (de)compressor definitions
if os.uname()[0] in ["Linux", "linux"]:
@@ -36,10 +37,12 @@ confdefaults={
"compression_mode": 'lbzip2',
"compressor_arch": None,
"compressor_options": XATTRS_OPTIONS[TAR],
+ "decomp_opt": DECOMPRESSOR_PROGRAM_OPTIONS[TAR],
"decompressor_search_order": DECOMPRESSOR_SEARCH_ORDER,
"distdir": "/usr/portage/distfiles",
"hash_function": "crc32",
"icecream": "/var/cache/icecream",
+ 'list_xattrs_opt': LIST_XATTRS_OPTIONS[TAR],
"local_overlay": "/usr/local/portage",
"port_conf": "/etc/portage",
"make_conf": "%(port_conf)s/make.conf",