Make sure Scheduler._choose_pkg() doesn't return a package too early when

there's no digraph and the previous merge hasn't completed yet.

svn path=/main/trunk/; revision=11266

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index 91b5c005118b80bfdee7ef649678a1fb998a5ab3..87c6262a40ab8ddf1aa3210f11828ca4d78ec4ab 100644 (file)
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -9568,6 +9568,9 @@ class Scheduler(PollScheduler):
                        return None
 
                if self._digraph is None:
+                       if self._jobs or self._task_queues.merge:
+                               self._choose_pkg_return_early = True
+                               return None
                        return self._pkg_queue.pop(0)
 
                self._prune_digraph()