diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-07-29 20:52:05 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-07-29 20:52:05 +0000 |
| commit | 8f5e0434c9bfca67c1e3f2edc08e92ee552c5de7 (patch) | |
| tree | f06c69f0f1d0b0a7f807967a8b83f1781a754aa9 | |
| parent | c06e8216f9b8a5fc59757422539a199aa274654a (diff) | |
| download | portage-8f5e0434c9bfca67c1e3f2edc08e92ee552c5de7.tar.gz portage-8f5e0434c9bfca67c1e3f2edc08e92ee552c5de7.tar.bz2 portage-8f5e0434c9bfca67c1e3f2edc08e92ee552c5de7.zip | |
Fix _choose_pkg() to always return something if nothing is running or merging.
svn path=/main/trunk/; revision=11272
| -rw-r--r-- | pym/_emerge/__init__.py | 3 |
1 files changed, 3 insertions, 0 deletions
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 |