summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--pym/_emerge/Scheduler.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/pym/_emerge/Scheduler.py b/pym/_emerge/Scheduler.py
index d22d104b1..8f025f5e6 100644
--- a/pym/_emerge/Scheduler.py
+++ b/pym/_emerge/Scheduler.py
@@ -1338,7 +1338,8 @@ class Scheduler(PollScheduler):
return None
return self._pkg_queue.pop(0)
- if not (self._jobs or self._task_queues.merge):
+ if not (self._jobs or \
+ self._task_queues.merge or self._merge_wait_queue):
return self._pkg_queue.pop(0)
self._prune_digraph()