diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2012-04-29 00:15:10 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2012-04-29 00:15:10 +0000 |
| commit | 6bc64c3f3e3c9cbf9572b6ca4755366321d1855b (patch) | |
| tree | dc73d4ee6d111df919adc044904855b78185de3c /eclass/unpacker.eclass | |
| parent | Version bump; addd sinatra to the test dependencies, remove dropped dependenc... (diff) | |
| download | historical-6bc64c3f3e3c9cbf9572b6ca4755366321d1855b.tar.gz historical-6bc64c3f3e3c9cbf9572b6ca4755366321d1855b.tar.bz2 historical-6bc64c3f3e3c9cbf9572b6ca4755366321d1855b.zip | |
fix by David Leverton for PORTAGE_BZIP2_COMMAND/PORTAGE_BUNZIP2_COMMAND fallbacks #413847
Diffstat (limited to 'eclass/unpacker.eclass')
| -rw-r--r-- | eclass/unpacker.eclass | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/eclass/unpacker.eclass b/eclass/unpacker.eclass index 993e2460267a..7869b2a1d8b1 100644 --- a/eclass/unpacker.eclass +++ b/eclass/unpacker.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/unpacker.eclass,v 1.7 2012/04/21 05:45:29 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/unpacker.eclass,v 1.8 2012/04/29 00:15:10 vapier Exp $ # @ECLASS: unpacker.eclass # @MAINTAINER: @@ -292,8 +292,8 @@ _unpacker() { # first figure out the decompression method case ${m} in *.bz2|*.tbz|*.tbz2) - local bzcmd=${PORTAGE_BZIP2_COMMAND:-$(type -P pbzip2 || bzip2)} - local bzuncmd=${PORTAGE_BUNZIP2_COMMAND:-${PORTAGE_BZIP2_COMMAND} -d} + local bzcmd=${PORTAGE_BZIP2_COMMAND:-$(type -P pbzip2 || type -P bzip2)} + local bzuncmd=${PORTAGE_BUNZIP2_COMMAND:-${bzcmd} -d} : ${UNPACKER_BZ2:=${bzuncmd}} comp="${UNPACKER_BZ2} -c" ;; |