diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-12-03 23:07:18 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-12-03 23:07:18 +0000 |
| commit | 0bf60dfd613fd8b4bab2192da47c9cef54ebd775 (patch) | |
| tree | 5f8d1b1a9879d21ec7c66e56233c881f07e91a49 /bin/ebuild.sh | |
| parent | 44078142db2ada083b82fa0ab44636de3bd5f716 (diff) | |
| download | portage-0bf60dfd613fd8b4bab2192da47c9cef54ebd775.tar.gz portage-0bf60dfd613fd8b4bab2192da47c9cef54ebd775.tar.bz2 portage-0bf60dfd613fd8b4bab2192da47c9cef54ebd775.zip | |
Synchronize the conditional that triggers "${T}"/environment
generation with the conditional that triggers distcc and
ccache FEATURES setup. (trunk r8833)
svn path=/main/branches/2.1.2/; revision=8834
Diffstat (limited to 'bin/ebuild.sh')
| -rwxr-xr-x | bin/ebuild.sh | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/bin/ebuild.sh b/bin/ebuild.sh index f4de63b15..6ea534de4 100755 --- a/bin/ebuild.sh +++ b/bin/ebuild.sh @@ -1475,9 +1475,8 @@ preprocess_ebuild_env() { # === === === === === functions end, main part begins === === === === === # === === === === === === === === === === === === === === === === === === -if [[ ${EBUILD_SH_ARGS} != "depend" ]] && [[ ${EBUILD_SH_ARGS} != "clean" ]] && [[ ${EBUILD_SH_ARGS} != "setup" ]]; then - cd ${PORTAGE_TMPDIR} &> /dev/null - cd ${BUILD_PREFIX} &> /dev/null +if [ -n "${EBUILD_SH_ARGS}" ] && \ + ! hasq ${EBUILD_SH_ARGS} clean depend help info nofetch ; then if [ "$(id -nu)" == "portage" ] ; then export USER=portage @@ -1778,7 +1777,7 @@ fi # Save the env only for relevant phases. if [ -n "${EBUILD_SH_ARGS}" ] && \ - ! hasq ${EBUILD_SH_ARGS} clean help info nofetch ; then + ! hasq ${EBUILD_SH_ARGS} clean depend help info nofetch ; then # Save current environment and touch a success file. (echo for success) umask 002 save_ebuild_env | filter_readonly_variables > "${T}/environment" |