diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2010-07-07 16:11:32 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-07-07 16:11:32 -0700 |
| commit | e89da47d4ef51fba3d5a03f1b379d9ad02190d22 (patch) | |
| tree | 508664a3802cac1d1a52937eef41d256c41a3493 /pym/_emerge | |
| parent | repoman: Fix bogus warnings "Invalid atom in [..]/package.keywords: D" when w... (diff) | |
| download | portage-e89da47d4ef51fba3d5a03f1b379d9ad02190d22.tar.gz portage-e89da47d4ef51fba3d5a03f1b379d9ad02190d22.tar.bz2 portage-e89da47d4ef51fba3d5a03f1b379d9ad02190d22.zip | |
Bug #326787 - Fix intermittent failure to satisify dependencies in the
scheduler, caused by failure to account for _merge_wait_queue inside
_choose_pkg.
Diffstat (limited to 'pym/_emerge')
| -rw-r--r-- | pym/_emerge/Scheduler.py | 3 |
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() |