diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2007-12-25 01:34:22 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-12-25 01:34:22 +0000 |
| commit | 83b85b4c2f7c3c7e0e81b4dcc11c36571cd09a05 (patch) | |
| tree | b863e1c8f58627af2710b1c0eb07170aeea7f5b6 /bin | |
| parent | - small UI cleanups. *should* not cause problems with lack of missing newlines. (diff) | |
| download | portage-idfetch-83b85b4c2f7c3c7e0e81b4dcc11c36571cd09a05.tar.gz portage-idfetch-83b85b4c2f7c3c7e0e81b4dcc11c36571cd09a05.tar.bz2 portage-idfetch-83b85b4c2f7c3c7e0e81b4dcc11c36571cd09a05.zip | |
Bug #203239 - With FEATURES=noauto, always source ${EBUILD}.
This will load the ${T}/environment file if available and then
source ${EBUILD} to overwrite any functions that have changed.
svn path=/main/trunk/; revision=9051
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/ebuild.sh | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/bin/ebuild.sh b/bin/ebuild.sh index 27355a33..ecdcadba 100755 --- a/bin/ebuild.sh +++ b/bin/ebuild.sh @@ -1602,9 +1602,8 @@ if hasq "depend" "${EBUILD_SH_ARGS}"; then unset BIN_PATH BIN BODY FUNC_SRC fi -if hasq ${EBUILD_SH_ARGS} clean ; then - true -elif ! hasq ${EBUILD_PHASE} depend && [ -f "${T}"/environment ] ; then +if ! hasq ${EBUILD_PHASE} clean depend && \ + [ -f "${T}"/environment ] ; then # The environment may have been extracted from environment.bz2 or # may have come from another version of ebuild.sh or something. # In any case, preprocess it to prevent any potential interference. @@ -1635,8 +1634,10 @@ elif ! hasq ${EBUILD_PHASE} depend && [ -f "${T}"/environment ] ; then export SANDBOX_ON=${PORTAGE_SANDBOX_ON} unset PORTAGE_SANDBOX_ON source_all_bashrcs -else +fi +if ! hasq ${EBUILD_PHASE} clean && \ + ( [ ! -f "${T}"/environment ] || hasq noauto ${FEATURES} ) ; then # The bashrcs get an opportunity here to set aliases that will be expanded # during sourcing of ebuilds and eclasses. source_all_bashrcs |