From: Zac Medico <zmedico@gentoo.org>
Date: Wed, 21 Nov 2007 04:17:55 +0000 (-0000)
Subject: Move preinst IMAGE initialzation before bashrc handling.
X-Git-Tag: v2.2_pre1~361
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=568d2bee8c43fbf126817696532d9a8200fe9930;p=portage.git

Move preinst IMAGE initialzation before bashrc handling.

svn path=/main/trunk/; revision=8569
---

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index df579162b..ea871ee66 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -63,6 +63,10 @@ source "${PORTAGE_BIN_PATH}/isolated-functions.sh"  &>/dev/null
 OCC="$CC"
 OCXX="$CXX"
 
+# Set IMAGE for minimal backward compatibility with
+# overlays or user's bashrc, but don't export it.
+[ "${EBUILD_PHASE}" == "preinst" ] && IMAGE=${D}
+
 [[ $PORTAGE_QUIET != "" ]] && export PORTAGE_QUIET
 
 # the sandbox is disabled by default except when overridden in the relevant stages
@@ -1577,10 +1581,6 @@ if hasq ${EBUILD_PHASE} setup prerm && [ ! -f "${T}/environment" ]; then
 	fi
 fi
 
-# Set IMAGE for minimal backward compatibility with
-# overlays or user's bashrc, but don't export it.
-[ "${EBUILD_PHASE}" == "preinst" ] && IMAGE=${D}
-
 if hasq ${EBUILD_PHASE} clean ; then
 	true
 elif ! hasq ${EBUILD_PHASE} depend && [ -f "${T}"/environment ] ; then