From: Zac Medico <zmedico@gentoo.org>
Date: Sun, 12 Feb 2012 00:05:14 +0000 (-0800)
Subject: QueueScheduler: tweak run loop logic
X-Git-Tag: v2.2.0_alpha86~4
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=71b3466c9bc7c00835bf4665765d05b14c2c5c49;p=portage.git

QueueScheduler: tweak run loop logic
---

diff --git a/pym/_emerge/QueueScheduler.py b/pym/_emerge/QueueScheduler.py
index 5f8cf2674..731a677e5 100644
--- a/pym/_emerge/QueueScheduler.py
+++ b/pym/_emerge/QueueScheduler.py
@@ -44,15 +44,15 @@ class QueueScheduler(PollScheduler):
 				timeout, timeout_callback)
 
 		try:
-			self._schedule()
-
-			while self._keep_scheduling() and \
-				not (timeout_callback is not None and
+			while not (timeout_callback is not None and
 				timeout_callback.timed_out):
 				# We don't have any callbacks to trigger _schedule(),
 				# so we have to call it explicitly here.
 				self._schedule()
-				self.sched_iface.iteration()
+				if self._keep_scheduling():
+					self.sched_iface.iteration()
+				else:
+					break
 
 			while self._is_work_scheduled() and \
 				not (timeout_callback is not None and