Fix _choose_pkg() to always return something if nothing is running or merging.

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

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index c280b4a1e1352c66fc816b62ef0cadf70434c262..9629277a8fa939003e813e3f40cb8af59a2372c3 100644 (file)
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -9568,6 +9568,9 @@ class Scheduler(PollScheduler):
                                return None
                        return self._pkg_queue.pop(0)
 
+               if not (self._jobs or self._task_queues.merge):
+                       return self._pkg_queue.pop(0)
+
                self._prune_digraph()
 
                chosen_pkg = None