From 8f5e0434c9bfca67c1e3f2edc08e92ee552c5de7 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Tue, 29 Jul 2008 20:52:05 +0000 Subject: Fix _choose_pkg() to always return something if nothing is running or merging. svn path=/main/trunk/; revision=11272 --- pym/_emerge/__init__.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'pym/_emerge/__init__.py') diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index c280b4a1e..9629277a8 100644 --- 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 -- cgit v1.2.3-1-g7c22