Attachment #228063 for bug #264258

View | Details | Raw Unified | Return to bug 264258
Collapse All | Expand All




				tar xozf "$srcdir$x" || die "$myfail"
				;;
			tbz|tbz2)
				${PORTAGE_BZIP_COMMAND} -dc "$srcdir$x" | tar xof -
				assert "$myfail"
				;;
			ZIP|zip|jar)

				_unpack_tar gzip
				;;
			bz2|bz)
				_unpack_tar ${PORTAGE_BZIP_COMMAND}
				;;
			7Z|7z)
				local my_output

	save_ebuild_env --exclude-init-phases | filter_readonly_variables \
		--filter-path --filter-sandbox --allow-extra-vars > environment

	${PORTAGE_BZIP_COMMAND} -f9 environment

	cp "${EBUILD}" "${PF}.ebuild"
	[ -n "${PORTAGE_REPO_NAME}" ]  && echo "${PORTAGE_REPO_NAME}" > repository

			save_ebuild_env --exclude-init-phases | \
				filter_readonly_variables --filter-path \
				--filter-sandbox --allow-extra-vars \
				| ${PORTAGE_BZIP_COMMAND} -c -f9 > "$PORTAGE_UPDATE_ENV"
		fi
		;;
	unpack|prepare|configure|compile|test|clean|install)

Lines 716-722 dyn_package() { Link Here

(-)a/bin/misc-functions.sh (-1 / +1 lines)
716	PORTAGE_BINPKG_TMPFILE="${PKGDIR}/${CATEGORY}/${PF}.tbz2"	716	PORTAGE_BINPKG_TMPFILE="${PKGDIR}/${CATEGORY}/${PF}.tbz2"
717	mkdir -p "${PORTAGE_BINPKG_TMPFILE%/*}" \|\| die "mkdir failed"	717	mkdir -p "${PORTAGE_BINPKG_TMPFILE%/*}" \|\| die "mkdir failed"
718	tar $tar_options -cf - $PORTAGE_BINPKG_TAR_OPTS -C "${D}" . \| \	718	tar $tar_options -cf - $PORTAGE_BINPKG_TAR_OPTS -C "${D}" . \| \
719	bzip2 -cf > "$PORTAGE_BINPKG_TMPFILE"	719	${PORTAGE_BZIP_COMMAND} -cf > "$PORTAGE_BINPKG_TMPFILE"
720	assert "failed to pack binary package: '$PORTAGE_BINPKG_TMPFILE'"	720	assert "failed to pack binary package: '$PORTAGE_BINPKG_TMPFILE'"
721	EPYTHON= PYTHONPATH=${PORTAGE_PYM_PATH}${PYTHONPATH:+:}${PYTHONPATH} \	721	EPYTHON= PYTHONPATH=${PORTAGE_PYM_PATH}${PYTHONPATH:+:}${PYTHONPATH} \
722	"$PORTAGE_BIN_PATH"/xpak-helper.py recompose \	722	"$PORTAGE_BIN_PATH"/xpak-helper.py recompose \

Lines 108-113 PORTAGE_ELOG_MAILURI="root" Link Here

(-)a/cnf/make.globals (+3 lines)
108	PORTAGE_ELOG_MAILSUBJECT="[portage] ebuild log for \${PACKAGE} on \${HOST}"	108	PORTAGE_ELOG_MAILSUBJECT="[portage] ebuild log for \${PACKAGE} on \${HOST}"
109	PORTAGE_ELOG_MAILFROM="portage@localhost"	109	PORTAGE_ELOG_MAILFROM="portage@localhost"
110		110
		111	# Default bzip command
		112	PORTAGE_BZIP_COMMAND="bzip2"
		113
111	# *****************************	114	# *****************************
112	# DO NOT EDIT THIS FILE	115	# DO NOT EDIT THIS FILE
113	# ***************************************************	116	# ***************************************************

Lines 1-4 Link Here

(-)a/man/make.conf.5 (-1 / +5 lines)
1	.TH "MAKE.CONF" "5" "Aug 2008" "Portage 2.2" "Portage"	1	.TH "MAKE.CONF" "5" "April 2010" "Portage 2.2" "Portage"
2	.SH "NAME"	2	.SH "NAME"
3	make.conf \- custom settings for Portage	3	make.conf \- custom settings for Portage
4	.SH "SYNOPSIS"	4	.SH "SYNOPSIS"
Lines 548-553 setting as the base URI. Link Here
548	This variable contains options to be passed to the tar command for creation	548	This variable contains options to be passed to the tar command for creation
549	of binary packages.	549	of binary packages.
550	.TP	550	.TP
		551	\fBPORTAGE_BZIP_COMMAND\fR = \fI"bzip2"\fR
		552	This variable contains the command of the bzip2 compatible application that
		553	portage should use. This is used to unpack distfiles and create binary packages.
		554	.TP
551	\fBPORTAGE_COMPRESS\fR = \fI"bzip2"\fR	555	\fBPORTAGE_COMPRESS\fR = \fI"bzip2"\fR
552	This variable contains the command used to compress documentation during the	556	This variable contains the command used to compress documentation during the
553	install phase.	557	install phase.




# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2

from _emerge.SpawnProcess import SpawnProcess

	_shell_binary = portage.const.BASH_BINARY

	def _start(self):
		bzip_command = portage.settings["PORTAGE_BZIP_COMMAND"]
		self.args = [self._shell_binary, "-c ",
			(bzip_command + " -dqc -- %s | tar -xp -C %s -f - ; " + \
			"p=(${PIPESTATUS[@]}) ; " + \
			"if [ ${p[0]} != 0 ] ; then " + \
			"echo " + bzip_command + " failed with status ${p[0]} ; exit ${p[0]} ; fi ; " + \
			"if [ ${p[1]} != 0 ] ; then " + \
			"echo tar failed with status ${p[1]} ; exit ${p[1]} ; fi ; " + \
			"exit 0 ;") % \




from portage import auxdbkeys, bsd_chflags, dep_check, \
	eapi_is_supported, merge, os, selinux, StringIO, \
	unmerge, _encodings, _parse_eapi_ebuild_head, _os_merge, \
	_shell_quote, _split_ebuild_name_glep55, _unicode_decode, _unicode_encode, \
	settings
from portage.const import EBUILD_SH_ENV_FILE, EBUILD_SH_BINARY, \
	INVALID_ENV_FILE, MISC_SH_BINARY
from portage.data import portage_gid, portage_uid, secpass, \

					os.path.dirname(myebuild), "environment.bz2")
				if not os.path.isfile(saved_env):
					saved_env = None
			bzip_command = settings["PORTAGE_BZIP_COMMAND"]
			if saved_env:
				retval = os.system(
					bzip_command + " -dc %s > %s" % \
					(_shell_quote(saved_env),
					_shell_quote(env_file)))
				try:
- 

Return to bug 264258

Lines 359-365 unpack() { Link Here

(-)a/bin/ebuild.sh (-4 / +4 lines)
359	tar xozf "$srcdir$x" \|\| die "$myfail"	359	tar xozf "$srcdir$x" \|\| die "$myfail"
360	;;	360	;;
361	tbz\|tbz2)	361	tbz\|tbz2)
362	bzip2 -dc "$srcdir$x" \| tar xof -	362	${PORTAGE_BZIP_COMMAND} -dc "$srcdir$x" \| tar xof -
363	assert "$myfail"	363	assert "$myfail"
364	;;	364	;;
365	ZIP\|zip\|jar)	365	ZIP\|zip\|jar)
Lines 369-375 unpack() { Link Here
369	_unpack_tar gzip	369	_unpack_tar gzip
370	;;	370	;;
371	bz2\|bz)	371	bz2\|bz)
372	_unpack_tar bzip2	372	_unpack_tar ${PORTAGE_BZIP_COMMAND}
373	;;	373	;;
374	7Z\|7z)	374	7Z\|7z)
375	local my_output	375	local my_output
Lines 1091-1097 dyn_install() { Link Here
1091	save_ebuild_env --exclude-init-phases \| filter_readonly_variables \	1091	save_ebuild_env --exclude-init-phases \| filter_readonly_variables \
1092	--filter-path --filter-sandbox --allow-extra-vars > environment	1092	--filter-path --filter-sandbox --allow-extra-vars > environment
1093		1093
1094	bzip2 -f9 environment	1094	${PORTAGE_BZIP_COMMAND} -f9 environment
1095		1095
1096	cp "${EBUILD}" "${PF}.ebuild"	1096	cp "${EBUILD}" "${PF}.ebuild"
1097	[ -n "${PORTAGE_REPO_NAME}" ] && echo "${PORTAGE_REPO_NAME}" > repository	1097	[ -n "${PORTAGE_REPO_NAME}" ] && echo "${PORTAGE_REPO_NAME}" > repository
Lines 2026-2032 ebuild_main() { Link Here
2026	save_ebuild_env --exclude-init-phases \| \	2026	save_ebuild_env --exclude-init-phases \| \
2027	filter_readonly_variables --filter-path \	2027	filter_readonly_variables --filter-path \
2028	--filter-sandbox --allow-extra-vars \	2028	--filter-sandbox --allow-extra-vars \
2029	\| bzip2 -c -f9 > "$PORTAGE_UPDATE_ENV"	2029	\| ${PORTAGE_BZIP_COMMAND} -c -f9 > "$PORTAGE_UPDATE_ENV"
2030	fi	2030	fi
2031	;;	2031	;;
2032	unpack\|prepare\|configure\|compile\|test\|clean\|install)	2032	unpack\|prepare\|configure\|compile\|test\|clean\|install)

Lines 31-37 portage.proxy.lazyimport.lazyimport(globals(), Link Here

(-)a/pym/portage/package/ebuild/doebuild.py (-3 / +4 lines)
31	from portage import auxdbkeys, bsd_chflags, dep_check, \	31	from portage import auxdbkeys, bsd_chflags, dep_check, \
32	eapi_is_supported, merge, os, selinux, StringIO, \	32	eapi_is_supported, merge, os, selinux, StringIO, \
33	unmerge, _encodings, _parse_eapi_ebuild_head, _os_merge, \	33	unmerge, _encodings, _parse_eapi_ebuild_head, _os_merge, \
34	_shell_quote, _split_ebuild_name_glep55, _unicode_decode, _unicode_encode	34	_shell_quote, _split_ebuild_name_glep55, _unicode_decode, _unicode_encode, \
		35	settings
35	from portage.const import EBUILD_SH_ENV_FILE, EBUILD_SH_BINARY, \	36	from portage.const import EBUILD_SH_ENV_FILE, EBUILD_SH_BINARY, \
36	INVALID_ENV_FILE, MISC_SH_BINARY	37	INVALID_ENV_FILE, MISC_SH_BINARY
37	from portage.data import portage_gid, portage_uid, secpass, \	38	from portage.data import portage_gid, portage_uid, secpass, \
Lines 685-693 def doebuild(myebuild, mydo, myroot, mysettings, debug=0, listonly=0, Link Here
685	os.path.dirname(myebuild), "environment.bz2")	686	os.path.dirname(myebuild), "environment.bz2")
686	if not os.path.isfile(saved_env):	687	if not os.path.isfile(saved_env):
687	saved_env = None	688	saved_env = None
		689	bzip_command = settings["PORTAGE_BZIP_COMMAND"]
688	if saved_env:	690	if saved_env:
689	retval = os.system(	691	retval = os.system(
690	"bzip2 -dc %s > %s" % \	692	bzip_command + " -dc %s > %s" % \
691	(_shell_quote(saved_env),	693	(_shell_quote(saved_env),
692	_shell_quote(env_file)))	694	_shell_quote(env_file)))
693	try:	695	try:
694	-

Lines 1-4 Link Here

(-)a/pym/_emerge/BinpkgExtractorAsync.py (-4 / +5 lines)
1	# Copyright 1999-2009 Gentoo Foundation	1	# Copyright 1999-2010 Gentoo Foundation
2	# Distributed under the terms of the GNU General Public License v2	2	# Distributed under the terms of the GNU General Public License v2
3		3
4	from _emerge.SpawnProcess import SpawnProcess	4	from _emerge.SpawnProcess import SpawnProcess
Lines 12-22 class BinpkgExtractorAsync(SpawnProcess): Link Here
12	_shell_binary = portage.const.BASH_BINARY	12	_shell_binary = portage.const.BASH_BINARY
13		13
14	def _start(self):	14	def _start(self):
15	self.args = [self._shell_binary, "-c",	15	bzip_command = portage.settings["PORTAGE_BZIP_COMMAND"]
16	("bzip2 -dqc -- %s \| tar -xp -C %s -f - ; " + \	16	self.args = [self._shell_binary, "-c ",
		17	(bzip_command + " -dqc -- %s \| tar -xp -C %s -f - ; " + \
17	"p=(${PIPESTATUS[@]}) ; " + \	18	"p=(${PIPESTATUS[@]}) ; " + \
18	"if [ ${p[0]} != 0 ] ; then " + \	19	"if [ ${p[0]} != 0 ] ; then " + \
19	"echo bzip2 failed with status ${p[0]} ; exit ${p[0]} ; fi ; " + \	20	"echo " + bzip_command + " failed with status ${p[0]} ; exit ${p[0]} ; fi ; " + \
20	"if [ ${p[1]} != 0 ] ; then " + \	21	"if [ ${p[1]} != 0 ] ; then " + \
21	"echo tar failed with status ${p[1]} ; exit ${p[1]} ; fi ; " + \	22	"echo tar failed with status ${p[1]} ; exit ${p[1]} ; fi ; " + \
22	"exit 0 ;") % \	23	"exit 0 ;") % \