Fix logic from previous commit in Scheduler._choose_pkg() to ensure that

the --nodeps code is only triggered when --jobs > 1.

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

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index 7ef69a969016e6ba22f4a5acc96247f2676fbb82..cc8208f4e87c4d74d6c4bdec2236b50205f45f5d 100644 (file)
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -9909,7 +9909,8 @@ class Scheduler(PollScheduler):
 
                if self._digraph is None:
                        if (self._jobs or self._task_queues.merge) and \
-                               "--nodeps" not in self.myopts:
+                               not ("--nodeps" in self.myopts and \
+                               (self._max_jobs is True or self._max_jobs > 1)):
                                self._choose_pkg_return_early = True
                                return None
                        return self._pkg_queue.pop(0)