aboutsummaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2010-08-31 08:10:29 -0700
committerZac Medico <zmedico@gentoo.org>2010-08-31 08:10:29 -0700
commit9437c8071af071ebd753c4ed29ce53948dcb9b1e (patch)
treeb36736f0be38f37977a2d45da81a0d1878463646 /bin
parentShow PORTAGE_BZIP2_COMMAND and PORTAGE_BUNZIP2_COMMAND in emerge --info, (diff)
downloadportage-9437c8071af071ebd753c4ed29ce53948dcb9b1e.tar.gz
portage-9437c8071af071ebd753c4ed29ce53948dcb9b1e.tar.bz2
portage-9437c8071af071ebd753c4ed29ce53948dcb9b1e.zip
Add a fallback PORTAGE_BZIP2_COMMAND setting in ebuild.sh, as a
workaround for portage-9999 users.
Diffstat (limited to 'bin')
-rwxr-xr-xbin/ebuild.sh6
1 files changed, 6 insertions, 0 deletions
diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 7400ca2b7..1428ac8d2 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -23,6 +23,12 @@ PREROOTPATH=${PREROOTPATH%%:}
PATH=$PORTAGE_BIN_PATH/ebuild-helpers:$PREROOTPATH${PREROOTPATH:+:}/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin${ROOTPATH:+:}$ROOTPATH
export PATH
+# This is just a temporary workaround for portage-9999 users since
+# earlier portage versions do not detect a version change in this case
+# (9999 to 9999) and therefore they try execute an incompatible version of
+# ebuild.sh during the upgrade.
+export PORTAGE_BZIP2_COMMAND=${PORTAGE_BZIP2_COMMAND:-bzip2}
+
# These two functions wrap sourcing and calling respectively. At present they
# perform a qa check to make sure eclasses and ebuilds and profiles don't mess
# with shell opts (shopts). Ebuilds/eclasses changing shopts should reset them