From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 8 Jan 2008 09:05:24 +0000 (-0000)
Subject: After loading the environment, make sure the color variables
X-Git-Tag: v2.2_pre1~68
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=7d3b31bca09627ea348a0938e9746afe68332e87;p=portage.git

After loading the environment, make sure the color variables
are in sync with the current NOCOLOR setting.

svn path=/main/trunk/; revision=9158
---

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 8faa68f87..56347fc9d 100755
--- 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