From: Zac Medico <zmedico@gentoo.org>
Date: Wed, 7 Jul 2010 23:11:32 +0000 (-0700)
Subject: Bug #326787 - Fix intermittent failure to satisify dependencies in the
X-Git-Tag: v2.2_rc68~536
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e89da47d4ef51fba3d5a03f1b379d9ad02190d22;p=portage.git

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 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()