[gentoo-commits] portage r12542 - main/trunk/pym/_emerge

[Zac Medico (zmedico)]

Author: zmedico
Date: 2009-01-21 21:27:20 +0000 (Wed, 21 Jan 2009)
New Revision: 12542

Modified:
   main/trunk/pym/_emerge/__init__.py
Log:
In depgraph.loadResumeCommand(), account for unsatisfied dependencies of
installed packages if they are in the subgraph of dependencies of a package
which is scheduled to be installed.


Modified: main/trunk/pym/_emerge/__init__.py
===================================================================
--- main/trunk/pym/_emerge/__init__.py	2009-01-21 06:36:36 UTC (rev 12541)
+++ main/trunk/pym/_emerge/__init__.py	2009-01-21 21:27:20 UTC (rev 12542)
@@ -8515,11 +8515,35 @@
 			if not self._create_graph(allow_unsatisfied=True):
 				return False
 
-			# TODO: Add sanity checks to make sure that it's really
-			# safe to ignore all the deps that can be ignored here.
-			unsatisfied_deps = [x for x in self._unsatisfied_deps \
-				if isinstance(x.parent, Package) and \
-				x.parent.operation == "merge"]
+			unsatisfied_deps = []
+			for dep in self._unsatisfied_deps:
+				if not isinstance(dep.parent, Package):
+					continue
+				if dep.parent.operation == "merge":
+					unsatisfied_deps.append(dep)
+					continue
+
+				# For unsatisfied deps of installed packages, only account for
+				# them if they are in the subgraph of dependencies of a package
+				# which is scheduled to be installed.
+				unsatisfied_install = False
+				traversed = set()
+				dep_stack = self.digraph.parent_nodes(dep.parent)
+				while dep_stack:
+					node = dep_stack.pop()
+					if not isinstance(node, Package):
+						continue
+					if node.operation == "merge":
+						unsatisfied_install = True
+						break
+					if node in traversed:
+						continue
+					traversed.add(node)
+					dep_stack.extend(self.digraph.parent_nodes(node))
+
+				if unsatisfied_install:
+					unsatisfied_deps.append(dep)
+
 			if masked_tasks or unsatisfied_deps:
 				# This probably means that a required package
 				# was dropped via --skipfirst. It makes the