From: Zac Medico <zmedico@gentoo.org>
Date: Wed, 30 Apr 2008 00:09:25 +0000 (-0000)
Subject: Fix "deep" logic in depgraph._complete_graph() so that it always
X-Git-Tag: v2.2_pre6~78
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a1a04478d9eb5a00a3412f7f20309aa9e8c5bfe3;p=portage.git

Fix "deep" logic in depgraph._complete_graph() so that it always
properly recognizes whether or not "deep" was previously enabled.

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

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index 86cc8d485..6b5b9914a 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -3038,12 +3038,14 @@ class depgraph(object):
 		# accounted for.
 		self._select_atoms = self._select_atoms_from_graph
 		self._select_package = self._select_pkg_from_graph
-		self.myparams.add("deep")
+		already_deep = "deep" in self.myparams
+		if not already_deep:
+			self.myparams.add("deep")
 
 		for root in self.roots:
 			required_set_names = self._required_set_names.copy()
 			if root == self.target_root and \
-				("deep" in self.myparams or "empty" in self.myparams):
+				(already_deep or "empty" in self.myparams):
 				required_set_names.difference_update(self._sets)
 			if not required_set_names and not self._ignored_deps:
 				continue