From: Zac Medico <zmedico@gentoo.org>
Date: Sun, 20 Jul 2008 02:38:09 +0000 (-0000)
Subject: Fix Scheduler emergelog() interaction to properly disable emergelog()
X-Git-Tag: v2.2_rc2~23
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=39072bea5f47ce4d79aa4fddb57a8047301f4214;p=portage.git

Fix Scheduler emergelog() interaction to properly disable emergelog()
xterm titles whenever the status display is enabled.

svn path=/main/trunk/; revision=11146
---

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index c7c398706..14aaa6047 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -8643,10 +8643,10 @@ class Scheduler(PollScheduler):
 		__slots__ = ("curval", "maxval")
 
 	class _emerge_log_class(SlotObject):
-		__slots__ = ("parallel", "xterm_titles",)
+		__slots__ = ("xterm_titles",)
 
 		def log(self, *pargs, **kwargs):
-			if self.parallel:
+			if not self.xterm_titles:
 				# Avoid interference with the scheduler's status display.
 				kwargs.pop("short_msg", None)
 			emergelog(self.xterm_titles, *pargs, **kwargs)
@@ -8685,8 +8685,7 @@ class Scheduler(PollScheduler):
 			self._config_pool[root] = []
 			self._blocker_db[root] = BlockerDB(trees[root]["root_config"])
 		self.curval = 0
-		self._logger = self._emerge_log_class(
-			xterm_titles=("notitles" not in settings.features))
+		self._logger = self._emerge_log_class()
 		fetch_iface = self._fetch_iface_class(log_file=self._fetch_log,
 			schedule=self._schedule_fetch)
 		self._sched_iface = self._iface_class(
@@ -8790,13 +8789,15 @@ class Scheduler(PollScheduler):
 		"""
 		background = self._max_jobs > 1 or "--quiet" in self.myopts
 
-		self._logger.parallel = background
-
 		self._status_display.quiet = \
 			not background or \
 			("--quiet" in self.myopts and \
 			"--verbose" not in self.myopts)
 
+		self._logger.xterm_titles = \
+			"notitles" not in self.settings.features and \
+			self._status_display.quiet
+
 		return background
 
 	def _set_digraph(self, digraph):