From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 11 Jan 2008 05:39:08 +0000 (-0000)
Subject: After loading the environment, make sure the color variables
X-Git-Tag: v2.1.4~16
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=bd011a40b0257c0d279493050745d7be46c397de;p=portage.git

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 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