diff options
author | Zac Medico <zmedico@gentoo.org> | 2010-01-29 18:47:51 +0000 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2010-01-29 18:47:51 +0000 |
commit | a10c9473d2f46ffa1a98f5a915af09311787a224 (patch) | |
tree | fa2701775e776d48e55ba8d9669ca0a4b70a1ee4 /pym | |
parent | 942c2f3736f4babf7d0ad9c291a8b4252622f13b (diff) | |
download | portage-a10c9473d2f46ffa1a98f5a915af09311787a224.tar.gz portage-a10c9473d2f46ffa1a98f5a915af09311787a224.tar.bz2 portage-a10c9473d2f46ffa1a98f5a915af09311787a224.zip |
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
Diffstat (limited to 'pym')
-rw-r--r-- | pym/_emerge/JobStatusDisplay.py | 4 | ||||
-rw-r--r-- | pym/_emerge/actions.py | 9 | ||||
-rw-r--r-- | pym/_emerge/main.py | 4 | ||||
-rw-r--r-- | pym/portage/getbinpkg.py | 2 |
4 files changed, 13 insertions, 6 deletions
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() |