From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 31 Aug 2010 15:10:29 +0000 (-0700)
Subject: Add a fallback PORTAGE_BZIP2_COMMAND setting in ebuild.sh, as a
X-Git-Tag: v2.2_rc73~19
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9437c8071af071ebd753c4ed29ce53948dcb9b1e;p=portage.git

Add a fallback PORTAGE_BZIP2_COMMAND setting in ebuild.sh, as a
workaround for portage-9999 users.
---

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