After loading the environment, make sure the color variables

are in sync with the current NOCOLOR setting. (trunk r9158)

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

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 8faa68f87ef4bff11e80e63293bf4e95c3cd3922..56347fc9d95b516cc13c9153f75bacf3478d2484 100755 (executable)
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -1630,6 +1630,18 @@ if ! hasq ${EBUILD_PHASE} clean 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
+
        source_all_bashrcs
 fi