From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 2 Oct 2008 02:52:41 +0000 (-0000)
Subject: Fix broken logic in Scheduler._main_loop() which would allow the main loop to
X-Git-Tag: v2.2_rc12~45
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b7ea99c8efbfaa72b46ee929b24b1e418bddde27;p=portage.git

Fix broken logic in Scheduler._main_loop() which would allow the main loop to
exit while one or more merges are still scheduled. Thanks to Patrick Lauer for
reporting.

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

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index 865e17198..366568c51 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -9857,7 +9857,7 @@ class Scheduler(PollScheduler):
 
 		while True:
 			self._schedule()
-			if not self._jobs or merge_queue:
+			if not (self._jobs or merge_queue):
 				break
 			if self._poll_event_handlers:
 				self._poll_loop()