diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-11-21 04:17:55 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-11-21 04:17:55 +0000 |
| commit | 568d2bee8c43fbf126817696532d9a8200fe9930 (patch) | |
| tree | 17c29d1c604f33b40331258e66331253636a404b /bin | |
| parent | a17b34e4d6077f67339284d5538cc60e7c835319 (diff) | |
| download | portage-568d2bee8c43fbf126817696532d9a8200fe9930.tar.gz portage-568d2bee8c43fbf126817696532d9a8200fe9930.tar.bz2 portage-568d2bee8c43fbf126817696532d9a8200fe9930.zip | |
Move preinst IMAGE initialzation before bashrc handling.
svn path=/main/trunk/; revision=8569
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/ebuild.sh | 8 |
1 files changed, 4 insertions, 4 deletions
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 |