diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-11-28 18:57:55 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-11-28 18:57:55 +0000 |
| commit | ea39352213cc363039952c47751ae089b984ae40 (patch) | |
| tree | 99254957b0d2f6a20ff0fa4c4a33308ba620e1f0 | |
| parent | affbd5a9bcaee4d9f9d67475a72e344ba5c61106 (diff) | |
| download | portage-ea39352213cc363039952c47751ae089b984ae40.tar.gz portage-ea39352213cc363039952c47751ae089b984ae40.tar.bz2 portage-ea39352213cc363039952c47751ae089b984ae40.zip | |
Bug #200652 - Skip ${T}/environment handling for pkg_nofetch().
svn path=/main/trunk/; revision=8729
| -rwxr-xr-x | bin/ebuild.sh | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/bin/ebuild.sh b/bin/ebuild.sh index e23434670..6bf5d88b7 100755 --- a/bin/ebuild.sh +++ b/bin/ebuild.sh @@ -1545,8 +1545,9 @@ if hasq "depend" "${EBUILD_SH_ARGS}"; then fi # Automatically try to load environment.bz2 whenever -# "${T}/environment" does not exist. -if ! hasq ${EBUILD_SH_ARGS} clean depend && \ +# "${T}/environment" does not exist, except for phases +# such as nofetch that do not require ${T} to exist. +if ! hasq ${EBUILD_SH_ARGS} clean depend nofetch && \ [ ! -f "${T}/environment" ] ; then bzip2 -dc "${EBUILD%/*}"/environment.bz2 > \ "${T}/environment" 2> /dev/null @@ -1766,7 +1767,7 @@ fi # Save the env only for relevant phases. if [ -n "${EBUILD_SH_ARGS}" ] && \ - ! hasq ${EBUILD_SH_ARGS} clean help info; then + ! hasq ${EBUILD_SH_ARGS} clean 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" |