Added --nocolor option courtesy of Jason Cooper on gentoo-user@g.o.

2 files changed, 10 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 74dfd15..59dcfc0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,12 +1,15 @@
 # ChangeLog for Portage; the Gentoo Linux ports system 
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Id: ChangeLog,v 1.796.2.91 2005/04/12 14:10:36 jstubbs Exp $
+# $Id: ChangeLog,v 1.796.2.92 2005/04/12 14:41:56 jstubbs Exp $
 
   MAJOR CHANGES in 2.0.51:
     1. /var/cache/edb/virtuals is no longer used at all. It's calculated now.
     2. /var/cache/edb/world is now /var/lib/portage/world.
     3. /etc/portage/profile/virtuals is _USER_ configs only.
 
+  12 Apr 2005; Jason Stubbs <jstubbs@gentoo.org> bin/emerge: Added --nocolor
+  option courtesy of Jason Cooper on gentoo-user@g.o.
+
   12 Apr 2005; Jason Stubbs <jstubbs@gentoo.org> bin/repoman: Fixed the date
   parsing of repoman to allow ranged and single years beginning 1999. #85242
 
diff --git a/bin/emerge b/bin/emerge
index 5202803..647ceed 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -1,7 +1,7 @@
 #!/usr/bin/python -O
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/emerge,v 1.345.2.21 2005/04/12 13:29:35 jstubbs Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/emerge,v 1.345.2.22 2005/04/12 14:41:56 jstubbs Exp $
 
 import os,sys
 os.environ["PORTAGE_CALLER"]="emerge"
@@ -151,7 +151,7 @@ options=[
 "--fetchonly",    "--fetch-all-uri",
 "--getbinpkg",    "--getbinpkgonly",
 "--help",         "--noconfmem",
-"--newuse",
+"--newuse",       "--nocolor",
 "--nodeps",       "--noreplace",
 "--nospinner",    "--oneshot",
 "--onlydeps",     "--pretend",
@@ -371,6 +371,10 @@ if ("--debug" in myopts):
 	portage.debug=1
 	portage.settings.lock()
 
+# Set color output
+if ("--nocolor" in myopts) and (sys.stdout.isatty()):
+	nocolor()
+
 CLEAN_DELAY = 5
 EMERGE_WARNING_DELAY = 10
 if portage.settings["CLEAN_DELAY"]: