From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 11 Nov 2008 05:39:32 +0000 (-0000)
Subject: Fix logic from previous commit in Scheduler._choose_pkg() to ensure that
X-Git-Tag: v2.2_rc14~10
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=afa6c3deda57361f09f651b0656e692207cd3d95;p=portage.git

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 7ef69a969..cc8208f4e 100644
--- 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)