From e89da47d4ef51fba3d5a03f1b379d9ad02190d22 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Wed, 7 Jul 2010 16:11:32 -0700 Subject: Bug #326787 - Fix intermittent failure to satisify dependencies in the scheduler, caused by failure to account for _merge_wait_queue inside _choose_pkg. --- pym/_emerge/Scheduler.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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() -- cgit v1.2.3-1-g7c22