| 1 |
Author: zmedico |
| 2 |
Date: 2009-04-30 07:30:03 +0000 (Thu, 30 Apr 2009) |
| 3 |
New Revision: 13549 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/2.1.6/pym/_emerge/__init__.py |
| 7 |
Log: |
| 8 |
Bug #267860 - Make JobStatusDisplay respect FEATURES=notitles. (trunk r13409) |
| 9 |
|
| 10 |
Modified: main/branches/2.1.6/pym/_emerge/__init__.py |
| 11 |
=================================================================== |
| 12 |
--- main/branches/2.1.6/pym/_emerge/__init__.py 2009-04-30 07:29:53 UTC (rev 13548) |
| 13 |
+++ main/branches/2.1.6/pym/_emerge/__init__.py 2009-04-30 07:30:03 UTC (rev 13549) |
| 14 |
@@ -9838,9 +9838,10 @@ |
| 15 |
'newline' : 'nel', |
| 16 |
} |
| 17 |
|
| 18 |
- def __init__(self, out=sys.stdout, quiet=False): |
| 19 |
+ def __init__(self, out=sys.stdout, quiet=False, xterm_titles=True): |
| 20 |
object.__setattr__(self, "out", out) |
| 21 |
object.__setattr__(self, "quiet", quiet) |
| 22 |
+ object.__setattr__(self, "xterm_titles", xterm_titles) |
| 23 |
object.__setattr__(self, "maxval", 0) |
| 24 |
object.__setattr__(self, "merges", 0) |
| 25 |
object.__setattr__(self, "_changed", False) |
| 26 |
@@ -10060,7 +10061,8 @@ |
| 27 |
else: |
| 28 |
self._update(color_output.getvalue()) |
| 29 |
|
| 30 |
- xtermTitle(" ".join(plain_output.split())) |
| 31 |
+ if self.xterm_titles: |
| 32 |
+ xtermTitle(" ".join(plain_output.split())) |
| 33 |
|
| 34 |
class ProgressHandler(object): |
| 35 |
def __init__(self): |
| 36 |
@@ -10204,7 +10206,8 @@ |
| 37 |
# being in a fragile state. For example, see bug #259954. |
| 38 |
self._unsatisfied_system_deps = set() |
| 39 |
|
| 40 |
- self._status_display = JobStatusDisplay() |
| 41 |
+ self._status_display = JobStatusDisplay( |
| 42 |
+ xterm_titles=('notitles' not in settings.features)) |
| 43 |
self._max_load = myopts.get("--load-average") |
| 44 |
max_jobs = myopts.get("--jobs") |
| 45 |
if max_jobs is None: |
Archives