From: Zac Medico <zmedico@gentoo.org>
Date: Sun, 13 Jul 2008 22:13:52 +0000 (-0000)
Subject: Ensure that that Scheduler._main_loop() doesn't return before the merge
X-Git-Tag: v2.2_rc2~106
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=31cda992011ad3773daf63b2a73c1176e3ac909c;p=portage.git

Ensure that that Scheduler._main_loop() doesn't return before the merge
queue is empty.

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

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index 2375546cf..b3f06aaba 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -8878,11 +8878,13 @@ class Scheduler(PollScheduler):
 		if self._is_restart_scheduled():
 			self._set_max_jobs(1)
 
+		merge_queue = self._task_queues.merge
+
 		while not self._failed_pkgs and \
 			self._schedule():
 			self._poll_loop()
 
-		while self._jobs:
+		while self._jobs or merge_queue:
 			self._poll_loop()
 
 	def _schedule_tasks(self):