From a10c9473d2f46ffa1a98f5a915af09311787a224 Mon Sep 17 00:00:00 2001
From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 29 Jan 2010 18:47:51 +0000
Subject: Bug #300388 - Fix terminal handling code to so term codes aren't sent
 when TERM=dumb. (trunk r15191)

svn path=/main/branches/2.1.7/; revision=15246
---
 bin/ebuild                      | 1 +
 bin/emaint                      | 2 +-
 bin/repoman                     | 1 +
 pym/_emerge/JobStatusDisplay.py | 4 +++-
 pym/_emerge/actions.py          | 9 ++++++---
 pym/_emerge/main.py             | 4 +++-
 pym/portage/getbinpkg.py        | 2 +-
 7 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/bin/ebuild b/bin/ebuild
index dc3f448c4..d8eec06a7 100755
--- a/bin/ebuild
+++ b/bin/ebuild
@@ -88,6 +88,7 @@ if debug and "python-trace" in portage.features:
 if not opts.color == 'y' and \
 	(opts.color == 'n' or \
 	portage.settings.get('NOCOLOR') in ('yes', 'true') or \
+	portage.settings.get('TERM') == 'dumb' or \
 	not sys.stdout.isatty()):
 	portage.output.nocolor()
 	portage.settings.unlock()
diff --git a/bin/emaint b/bin/emaint
index 9da3f4220..90301dbff 100755
--- a/bin/emaint
+++ b/bin/emaint
@@ -536,7 +536,7 @@ def emaint_main(myargv):
 		status = "Attempting to fix %s"
 		func = "fix"
 
-	isatty = sys.stdout.isatty()
+	isatty = os.environ.get('TERM') != 'dumb' and sys.stdout.isatty()
 	for task in tasks:
 		print(status % task.name())
 		inst = task()
diff --git a/bin/repoman b/bin/repoman
index 7778447d5..ec6f2d41e 100755
--- a/bin/repoman
+++ b/bin/repoman
@@ -96,6 +96,7 @@ repoman_settings = portage.config(local_config=False,
 repoman_settings.lock()
 
 if repoman_settings.get("NOCOLOR", "").lower() in ("yes", "true") or \
+	repoman_settings.get('TERM') == 'dumb' or \
 	not sys.stdout.isatty():
 	nocolor()
 
diff --git a/pym/_emerge/JobStatusDisplay.py b/pym/_emerge/JobStatusDisplay.py
index dfc766d26..83603ed87 100644
--- a/pym/_emerge/JobStatusDisplay.py
+++ b/pym/_emerge/JobStatusDisplay.py
@@ -55,7 +55,9 @@ class JobStatusDisplay(object):
 		object.__setattr__(self, "_jobs_column_width", width - 32)
 		self.reset()
 
-		isatty = hasattr(self.out, "isatty") and self.out.isatty()
+		isatty = os.environ.get('TERM') != 'dumb' and \
+			hasattr(self.out, 'isatty') and \
+			self.out.isatty()
 		object.__setattr__(self, "_isatty", isatty)
 		if not isatty or not self._init_term():
 			term_codes = {}
diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py
index 14854c06f..66a47da8f 100644
--- a/pym/_emerge/actions.py
+++ b/pym/_emerge/actions.py
@@ -1291,8 +1291,10 @@ def action_metadata(settings, portdb, myopts, porttrees=None):
 
 	porttrees = [tree_data.path for tree_data in porttrees_data]
 
-	isatty = sys.stdout.isatty()
-	quiet = not isatty or '--quiet' in myopts
+	quiet = settings.get('TERM') == 'dumb' or \
+		'--quiet' in myopts or \
+		not sys.stdout.isatty()
+
 	onProgress = None
 	if not quiet:
 		progressBar = portage.output.TermProgressBar()
@@ -2213,7 +2215,8 @@ def adjust_config(myopts, settings):
 			portage.output.havecolor = 0
 			settings["NOCOLOR"] = "true"
 		settings.backup_changes("NOCOLOR")
-	elif not sys.stdout.isatty() and settings.get("NOCOLOR") != "no":
+	elif settings.get('TERM') == 'dumb' or \
+		not sys.stdout.isatty():
 		portage.output.havecolor = 0
 		settings["NOCOLOR"] = "true"
 		settings.backup_changes("NOCOLOR")
diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py
index d592377f9..7b6221107 100644
--- a/pym/_emerge/main.py
+++ b/pym/_emerge/main.py
@@ -1179,7 +1179,9 @@ def emerge_main():
 			portage.debug.set_trace(True)
 
 	if not ("--quiet" in myopts):
-		if not sys.stdout.isatty() or ("--nospinner" in myopts):
+		if '--nospinner' in myopts or \
+			settings.get('TERM') == 'dumb' or \
+			not sys.stdout.isatty():
 			spinner.update = spinner.update_basic
 
 	if myaction == 'version':
diff --git a/pym/portage/getbinpkg.py b/pym/portage/getbinpkg.py
index 42938de99..26b2bb1fc 100644
--- a/pym/portage/getbinpkg.py
+++ b/pym/portage/getbinpkg.py
@@ -638,7 +638,7 @@ def dir_get_metadata(baseurl, conn=None, chunk_size=3000, verbose=1, usingcache=
 			self.out.flush()
 
 	cache_stats = CacheStats(out)
-	have_tty = out.isatty()
+	have_tty = os.environ.get('TERM') != 'dumb' and out.isatty()
 	if have_tty:
 		cache_stats.display()
 	binpkg_filenames = set()
-- 
cgit v1.2.3-1-g7c22