[gentoo-commits] proj/portage:master commit in: pym/_emerge/

[Zac Medico]

commit:     071fa4eb82ba9dbb2f0ae3c78cb87580eb6baeff
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Wed Feb  8 05:03:32 2012 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Wed Feb  8 05:03:32 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=071fa4eb

QueueScheduler: tweak timeout handling

---
 pym/_emerge/QueueScheduler.py |   23 +++++++++++++----------
 1 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/pym/_emerge/QueueScheduler.py b/pym/_emerge/QueueScheduler.py
index 91a2831..db7aa5a 100644
--- a/pym/_emerge/QueueScheduler.py
+++ b/pym/_emerge/QueueScheduler.py
@@ -36,25 +36,28 @@ class QueueScheduler(PollScheduler):
 
 	def run(self, timeout=None):
 
-		timeout_id = None
+		timeout_callback = None
 		if timeout is not None:
 			def timeout_callback():
-				raise StopIteration()
-			timeout_id = self._timeout_add(timeout, timeout_callback)
+				timeout_callback.timed_out = True
+				return False
+			timeout_callback.timed_out = False
+			timeout_callback.timeout_id = self._timeout_add(
+				timeout, timeout_callback)
 
 		try:
 
-			while self._schedule():
+			while not (timeout_callback is not None and
+				timeout_callback.timed_out) and self._schedule():
 				self._iteration()
 
-			while self._running_job_count():
+			while not (timeout_callback is not None and
+				timeout_callback.timed_out) and self._running_job_count():
 				self._iteration()
 
-		except StopIteration:
-			pass
-
-		if timeout_id is not None:
-			self._unregister(timeout_id)
+		finally:
+			if timeout_callback is not None:
+				self._unregister(timeout_callback.timeout_id)
 
 	def _schedule_tasks(self):
 		"""