diff options
| author | Zac Medico <zmedico@gentoo.org> | 2006-06-26 21:21:42 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2006-06-26 21:21:42 +0000 |
| commit | 6bd3433c0b5af2c51e22d4b7beedd046b27818d7 (patch) | |
| tree | 2cd35e64fa8dd6e9b07644ee942a709a675508a9 | |
| parent | 156695fb4c84016e57067fc652467860a024a6bd (diff) | |
| download | portage-6bd3433c0b5af2c51e22d4b7beedd046b27818d7.tar.gz portage-6bd3433c0b5af2c51e22d4b7beedd046b27818d7.tar.bz2 portage-6bd3433c0b5af2c51e22d4b7beedd046b27818d7.zip | |
For compatibility with revdep-rebuild, do not allow NOCOLOR=false to override the isatty() check.
svn path=/main/trunk/; revision=3669
| -rwxr-xr-x | bin/emerge | 6 |
1 files changed, 5 insertions, 1 deletions
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:] |