aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2010-08-30 20:55:11 -0700
committerZac Medico <zmedico@gentoo.org>2010-08-30 20:55:11 -0700
commit50daef1ab961c42a3352281e915da5a89297e3a9 (patch)
tree8396db45ae2ec7ba70067f9b20c2ffedf92a9939 /pym/_emerge/BinpkgExtractorAsync.py
parentBug #326561 - Implement FEATURES=unknown-features-filter. This is not (diff)
downloadportage-50daef1ab961c42a3352281e915da5a89297e3a9.tar.gz
portage-50daef1ab961c42a3352281e915da5a89297e3a9.tar.bz2
portage-50daef1ab961c42a3352281e915da5a89297e3a9.zip
Bug #335340 - Add support for PORTAGE_BZIP2_COMMAND and
PORTAGE_BUNZIP2_COMMAND settings in make.conf. This only adds support for binary packages, since that's where pbzip2 can provide the most benefit in common cases.
Diffstat (limited to 'pym/_emerge/BinpkgExtractorAsync.py')
-rw-r--r--pym/_emerge/BinpkgExtractorAsync.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/pym/_emerge/BinpkgExtractorAsync.py b/pym/_emerge/BinpkgExtractorAsync.py
index a2bbe7a45..004544e92 100644
--- a/pym/_emerge/BinpkgExtractorAsync.py
+++ b/pym/_emerge/BinpkgExtractorAsync.py
@@ -16,7 +16,7 @@ class BinpkgExtractorAsync(SpawnProcess):
# SIGPIPE handling (128 + SIGPIPE) should be compatible with
# assert_sigpipe_ok() that's used by the ebuild unpack() helper.
self.args = [self._shell_binary, "-c",
- ("bzip2 -dqc -- %s | tar -xp -C %s -f - ; " + \
+ ("${PORTAGE_BUNZIP2_COMMAND:-${PORTAGE_BZIP2_COMMAND} -d} -c -- %s | tar -xp -C %s -f - ; " + \
"p=(${PIPESTATUS[@]}) ; " + \
"if [[ ${p[0]} != 0 && ${p[0]} != %d ]] ; then " % (128 + signal.SIGPIPE) + \
"echo bzip2 failed with status ${p[0]} ; exit ${p[0]} ; fi ; " + \
@@ -26,5 +26,4 @@ class BinpkgExtractorAsync(SpawnProcess):
(portage._shell_quote(self.pkg_path),
portage._shell_quote(self.image_dir))]
- self.env = os.environ.copy()
SpawnProcess._start(self)