summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--pym/_emerge/__init__.py4
1 files changed, 3 insertions, 1 deletions
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):