[gentoo-commits] portage r11273 - main/trunk/pym/_emerge

[Zac Medico (zmedico)]

Author: zmedico
Date: 2008-07-29 21:27:59 +0000 (Tue, 29 Jul 2008)
New Revision: 11273

Modified:
   main/trunk/pym/_emerge/__init__.py
Log:
Count state changes in Scheduler._schedule_tasks() and avoid some extra calls
when nothing changes.


Modified: main/trunk/pym/_emerge/__init__.py
===================================================================
--- main/trunk/pym/_emerge/__init__.py	2008-07-29 20:52:05 UTC (rev 11272)
+++ main/trunk/pym/_emerge/__init__.py	2008-07-29 21:27:59 UTC (rev 11273)
@@ -9655,19 +9655,26 @@
 	def _schedule_tasks(self):
 		remaining, state_change = self._schedule_tasks_imp()
 		self._status_display.display()
+
+		state_change = 0
 		for q in self._task_queues.values():
-			q.schedule()
+			if q.schedule():
+				state_change += 1
 
 		# Cancel prefetchers if they're the only reason
 		# the main poll loop is still running.
 		if self._failed_pkgs and \
-			not (self._jobs or self._task_queues.merge):
+			not (self._jobs or self._task_queues.merge) and \
+			self._task_queues.fetch:
 			self._task_queues.fetch.clear()
+			state_change += 1
 
-		remaining, state_change = self._schedule_tasks_imp()
-		self._status_display.display()
-		return remaining
+		if state_change:
+			remaining, state_change = self._schedule_tasks_imp()
+			self._status_display.display()
 
+		return bool(self._pkg_queue and not self._failed_pkgs)
+
 	def _job_delay(self):
 		"""
 		@rtype: bool