Bug #326787 - Fix intermittent failure to satisify dependencies in the

scheduler, caused by failure to account for _merge_wait_queue inside
_choose_pkg.

diff --git a/pym/_emerge/Scheduler.py b/pym/_emerge/Scheduler.py
index d22d104b19cd39ac67b2bf8b74a6909749902547..8f025f5e6467e7a9573cb3629854143b01b62f18 100644 (file)
--- 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()