summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2008-10-02 02:52:41 +0000
committerZac Medico <zmedico@gentoo.org>2008-10-02 02:52:41 +0000
commitb7ea99c8efbfaa72b46ee929b24b1e418bddde27 (patch)
tree45823a94e726b4bdc81789bafd45261a4d360711
parent85202bc677bc10a9862e81fee13563de47f9d1f2 (diff)
downloadportage-b7ea99c8efbfaa72b46ee929b24b1e418bddde27.tar.gz
portage-b7ea99c8efbfaa72b46ee929b24b1e418bddde27.tar.bz2
portage-b7ea99c8efbfaa72b46ee929b24b1e418bddde27.zip
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
-rw-r--r--pym/_emerge/__init__.py2
1 files changed, 1 insertions, 1 deletions
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()