From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 26 Jun 2006 21:21:42 +0000 (-0000)
Subject: For compatibility with revdep-rebuild, do not allow NOCOLOR=false to override the... 
X-Git-Tag: v2.1.1~371
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6bd3433c0b5af2c51e22d4b7beedd046b27818d7;p=portage.git

For compatibility with revdep-rebuild, do not allow NOCOLOR=false to override the isatty() check.

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

diff --git a/bin/emerge b/bin/emerge
index f881858ca..f7292d1e2 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -3437,7 +3437,11 @@ def emerge_main():
 	if settings.get("NOCOLOR","") in ("yes","true"):
 		nocolor()
 	elif (not sys.stdout.isatty()) and \
-		settings.get("NOCOLOR","") not in ("no","false"):
+		settings.get("NOCOLOR","") != "no":
+		# revdep-rebuild exports NOCOLOR=false, so for now, don't allow
+		# NOCOLOR=false to override the isatty() check.  This can be fixed
+		# in revdep-rebuild by using the --nocolor option when appropriate
+		# instead of exporting NOCOLOR.
 		nocolor()
 
 	tmpcmdline = sys.argv[1:]