Bug #200652 - Skip ${T}/environment handling for pkg_nofetch(). (trunk r8729)

svn path=/main/branches/2.1.2/; revision=8730

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index e23434670b853ddab1571ae9aa5d562e90ddc807..6bf5d88b7adbf82f6557c92d08b61af157c660fa 100755 (executable)
--- 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"