From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 11 Nov 2008 05:01:58 +0000 (-0000)
Subject: When in --nodeps mode, make Scheduler._set_digraph() discard the digraph and
X-Git-Tag: v2.2_rc14~11
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=38fd16834433ee39610fa5923fe2d3fa5f0d793d;p=portage.git

When in --nodeps mode, make Scheduler._set_digraph() discard the digraph and
make Scheduler._choose_pkg() always return the task at the front of the queue.

svn path=/main/trunk/; revision=11847
---

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index f9304dd72..7ef69a969 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -9269,8 +9269,8 @@ class Scheduler(PollScheduler):
 		return interactive_tasks
 
 	def _set_digraph(self, digraph):
-		if self._max_jobs is not True and \
-			self._max_jobs < 2:
+		if "--nodeps" in self.myopts or \
+			(self._max_jobs is not True and self._max_jobs < 2):
 			# save some memory
 			self._digraph = None
 			return
@@ -9908,7 +9908,8 @@ class Scheduler(PollScheduler):
 			return None
 
 		if self._digraph is None:
-			if self._jobs or self._task_queues.merge:
+			if (self._jobs or self._task_queues.merge) and \
+				"--nodeps" not in self.myopts:
 				self._choose_pkg_return_early = True
 				return None
 			return self._pkg_queue.pop(0)