From 27532c515ba5d4d852b20ac6ddc3953d2d39dea6 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Tue, 29 Jul 2008 17:13:52 +0000 Subject: 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 --- pym/_emerge/__init__.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'pym/_emerge') 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() -- cgit v1.2.3-1-g7c22