Gentoo Archives: gentoo-commits

From: "Zac Medico (zmedico)" <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] portage r13409 - main/trunk/pym/_emerge
Date: Wed, 29 Apr 2009 17:40:30
Message-Id: E1LzDlk-0007ey-D6@stork.gentoo.org
1 Author: zmedico
2 Date: 2009-04-29 17:40:27 +0000 (Wed, 29 Apr 2009)
3 New Revision: 13409
4
5 Modified:
6 main/trunk/pym/_emerge/__init__.py
7 Log:
8 Bug #267860 - Make JobStatusDisplay respect FEATURES=notitles.
9
10
11 Modified: main/trunk/pym/_emerge/__init__.py
12 ===================================================================
13 --- main/trunk/pym/_emerge/__init__.py 2009-04-29 05:03:45 UTC (rev 13408)
14 +++ main/trunk/pym/_emerge/__init__.py 2009-04-29 17:40:27 UTC (rev 13409)
15 @@ -9854,9 +9854,10 @@
16 'newline' : 'nel',
17 }
18
19 - def __init__(self, out=sys.stdout, quiet=False):
20 + def __init__(self, out=sys.stdout, quiet=False, xterm_titles=True):
21 object.__setattr__(self, "out", out)
22 object.__setattr__(self, "quiet", quiet)
23 + object.__setattr__(self, "xterm_titles", xterm_titles)
24 object.__setattr__(self, "maxval", 0)
25 object.__setattr__(self, "merges", 0)
26 object.__setattr__(self, "_changed", False)
27 @@ -10076,7 +10077,8 @@
28 else:
29 self._update(color_output.getvalue())
30
31 - xtermTitle(" ".join(plain_output.split()))
32 + if self.xterm_titles:
33 + xtermTitle(" ".join(plain_output.split()))
34
35 class ProgressHandler(object):
36 def __init__(self):
37 @@ -10220,7 +10222,8 @@
38 # being in a fragile state. For example, see bug #259954.
39 self._unsatisfied_system_deps = set()
40
41 - self._status_display = JobStatusDisplay()
42 + self._status_display = JobStatusDisplay(
43 + xterm_titles=('notitles' not in settings.features))
44 self._max_load = myopts.get("--load-average")
45 max_jobs = myopts.get("--jobs")
46 if max_jobs is None: