diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-07-29 17:13:52 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-07-29 17:13:52 +0000 |
| commit | 27532c515ba5d4d852b20ac6ddc3953d2d39dea6 (patch) | |
| tree | df0ae9ba5fcbfb92d93abd274e637638f1b66a60 | |
| parent | e6aa6838f9f05f0343f6317ac59920765579f584 (diff) | |
| download | portage-27532c515ba5d4d852b20ac6ddc3953d2d39dea6.tar.gz portage-27532c515ba5d4d852b20ac6ddc3953d2d39dea6.tar.bz2 portage-27532c515ba5d4d852b20ac6ddc3953d2d39dea6.zip | |
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
| -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 91b5c0051..87c6262a4 100644 --- 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() |