Attachment #428714 for bug #574422

Lines 144-150 class StageBase(TargetBase, ClearBase, GenBase): Link Here

(-)a/catalyst/base/stagebase.py (-2 / +5 lines)
144	self.decompressor = CompressMap(self.settings["decompress_definitions"],	144	self.decompressor = CompressMap(self.settings["decompress_definitions"],
145	env=self.env,	145	env=self.env,
146	search_order=self.settings["decompressor_search_order"],	146	search_order=self.settings["decompressor_search_order"],
147	comp_prog=self.settings["comp_prog"])	147	comp_prog=self.settings["comp_prog"],
		148	decomp_opt=self.settings["decomp_opt"])
148	self.accepted_extensions = self.decompressor.search_order_extensions(	149	self.accepted_extensions = self.decompressor.search_order_extensions(
149	self.settings["decompressor_search_order"])	150	self.settings["decompressor_search_order"])
150	log.notice("Source file specification matching setting is: %s",	151	log.notice("Source file specification matching setting is: %s",
Lines 690-695 class StageBase(TargetBase, ClearBase, GenBase): Link Here
690	'mode': None,	691	'mode': None,
691	'auto-ext': False,	692	'auto-ext': False,
692	'other_options': self.settings["compressor_options"],	693	'other_options': self.settings["compressor_options"],
		694	'comp_prog': self.settings["comp_prog"],
		695	'decomp_opt': self.settings["decomp_opt"],
693	}	696	}
694		697
695	display_msg = (	698	display_msg = (
Lines 1271-1277 class StageBase(TargetBase, ClearBase, GenBase): Link Here
1271	if not self.compressor:	1274	if not self.compressor:
1272	self.compressor = CompressMap(self.settings["compress_definitions"],	1275	self.compressor = CompressMap(self.settings["compress_definitions"],
1273	env=self.env, default_mode=self.settings['compression_mode'],	1276	env=self.env, default_mode=self.settings['compression_mode'],
1274	logger=log)	1277	comp_prog=self.settings["comp_prog"],logger=log)
1275		1278
1276	if "autoresume" in self.settings["options"] \	1279	if "autoresume" in self.settings["options"] \
1277	and self.resume.is_enabled("capture"):	1280	and self.resume.is_enabled("capture"):





import os

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"]:

confdefaults={
	"archdir": "%(PythonDir)s/arch",
	"comp_prog": COMPRESSOR_PROGRAM_OPTIONS[TAR],
	"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",

Lines 330-336 def _main(parser, opts): Link Here

(-)a/catalyst/main.py (-1 / +3 lines)
330		330
331	# initialize our contents generator	331	# initialize our contents generator
332	contents_map = ContentsMap(CONTENTS_DEFINITIONS,	332	contents_map = ContentsMap(CONTENTS_DEFINITIONS,
333	comp_prog=conf_values['comp_prog'])	333	comp_prog=conf_values['comp_prog'],
		334	decomp_opt=conf_values['decomp_opt'],
		335	list_xattrs_opt=conf_values['list_xattrs_opt'])
334	conf_values["contents_map"] = contents_map	336	conf_values["contents_map"] = contents_map
335		337
336	# initialze our hash and contents generators	338	# initialze our hash and contents generators

Lines 64-70 class snapshot(TargetBase, GenBase): Link Here

(-)a/catalyst/targets/snapshot.py (-1 / +2 lines)
64		64
65	log.notice('Compressing Portage snapshot tarball ...')	65	log.notice('Compressing Portage snapshot tarball ...')
66	compressor = CompressMap(self.settings["compress_definitions"],	66	compressor = CompressMap(self.settings["compress_definitions"],
67	env=self.env, default_mode=self.settings['compression_mode'])	67	env=self.env, default_mode=self.settings['compression_mode'],
		68	comp_prog=self.settings["comp_prog"])
68	infodict = compressor.create_infodict(	69	infodict = compressor.create_infodict(
69	source=self.settings["repo_name"],	70	source=self.settings["repo_name"],
70	destination=self.settings["snapshot_path"],	71	destination=self.settings["snapshot_path"],

Return to bug 574422

Lines 1-8 Link Here

(-)a/catalyst/defaults.py (-3 / +6 lines)
1		1
2	import os	2	import os
3		3
4	from DeComp.definitions import DECOMPRESSOR_XATTR_SEARCH_ORDER	4	from DeComp.definitions import DECOMPRESSOR_SEARCH_ORDER
5	from DeComp.definitions import COMPRESSOR_PROGRAM_OPTIONS, XATTRS_OPTIONS	5	from DeComp.definitions import COMPRESSOR_PROGRAM_OPTIONS, XATTRS_OPTIONS
		6	from DeComp.definitions import DECOMPRESSOR_PROGRAM_OPTIONS, LIST_XATTRS_OPTIONS
6		7
7	# Used for the (de)compressor definitions	8	# Used for the (de)compressor definitions
8	if os.uname()[0] in ["Linux", "linux"]:	9	if os.uname()[0] in ["Linux", "linux"]:
Lines 33-45 valid_config_file_values.extend([ "distcc", "envscript", Link Here
33	confdefaults={	34	confdefaults={
34	"archdir": "%(PythonDir)s/arch",	35	"archdir": "%(PythonDir)s/arch",
35	"comp_prog": COMPRESSOR_PROGRAM_OPTIONS[TAR],	36	"comp_prog": COMPRESSOR_PROGRAM_OPTIONS[TAR],
36	"compression_mode": 'lbzip2_x',	37	"compression_mode": 'lbzip2',
37	"compressor_arch": None,	38	"compressor_arch": None,
38	"compressor_options": XATTRS_OPTIONS[TAR],	39	"compressor_options": XATTRS_OPTIONS[TAR],
39	"decompressor_search_order": DECOMPRESSOR_XATTR_SEARCH_ORDER,	40	"decomp_opt": DECOMPRESSOR_PROGRAM_OPTIONS[TAR],
		41	"decompressor_search_order": DECOMPRESSOR_SEARCH_ORDER,
40	"distdir": "/usr/portage/distfiles",	42	"distdir": "/usr/portage/distfiles",
41	"hash_function": "crc32",	43	"hash_function": "crc32",
42	"icecream": "/var/cache/icecream",	44	"icecream": "/var/cache/icecream",
		45	'list_xattrs_opt': LIST_XATTRS_OPTIONS[TAR],
43	"local_overlay": "/usr/local/portage",	46	"local_overlay": "/usr/local/portage",
44	"port_conf": "/etc/portage",	47	"port_conf": "/etc/portage",
45	"make_conf": "%(port_conf)s/make.conf",	48	"make_conf": "%(port_conf)s/make.conf",