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 2375546cf7d3cfffcfc7aa7013f0bf6c867a520c..b3f06aaba8d99c8a7fc009f39a7e3b4eee40a6b3 100644 (file)
--- 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):