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

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

diff --git a/bin/emerge b/bin/emerge
index f881858cae3800c86da464395a3bcf61dd6a57ca..f7292d1e2e7bf3166eb75410274d8b9b1304b5e5 100755 (executable)
--- 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:]