Make save_ebuild_env() filter NOCOLOR, and remove related code from ebuild.sh

since that variable is not loaded from $T/environment anymore. (trunk r12625)

svn path=/main/branches/2.1.6/; revision=12899

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 65684b05f168a2f6159c162f109081dbcf4c3475..d4bceae4069d58e829e541d6929c59c9ef1ee6f3 100755 (executable)
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -1831,18 +1831,6 @@ if ! hasq "$EBUILD_PHASE" clean cleanrm depend && \
        unset x y
        export SANDBOX_ON=${PORTAGE_SANDBOX_ON}
        unset PORTAGE_SANDBOX_ON
-
-       # After loading the environment, make sure the color variables
-       # are in sync with the current NOCOLOR setting.
-       case "${NOCOLOR:-false}" in
-               yes|true)
-                       unset_colors
-                       ;;
-               no|false)
-                       set_colors
-                       ;;
-       esac
-
 fi
 
 if ! hasq "$EBUILD_PHASE" clean cleanrm && \

diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh
index 5c1444efd175b96c1d4d6361d37ec4c2ae2456fa..82d2fed5bdc95cc47059b2755e327956abdb1590 100755 (executable)
--- a/bin/isolated-functions.sh
+++ b/bin/isolated-functions.sh
@@ -526,7 +526,7 @@ save_ebuild_env() {
                        ECLASSDIR ECLASS_DEPTH ENDCOL FAKEROOTKEY \
                        GOOD HILITE HOME IMAGE \
                        LAST_E_CMD LAST_E_LEN LD_PRELOAD MISC_FUNCTIONS_ARGS MOPREFIX \
-                       NORMAL PKGDIR PKGUSE PKG_LOGDIR PKG_TMPDIR \
+                       NOCOLOR NORMAL PKGDIR PKGUSE PKG_LOGDIR PKG_TMPDIR \
                        PORTAGE_ACTUAL_DISTDIR PORTAGE_ARCHLIST \
                        PORTAGE_BASHRC PORTAGE_BASHRCS_SOURCED \
                        PORTAGE_BINPKG_TAR_OPTS PORTAGE_BINPKG_TMPFILE PORTAGE_BUILDDIR \