From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 11 Aug 2011 03:27:45 +0000 (-0700)
Subject: resume_depgraph: prune all indirect unsatisfied
X-Git-Tag: v2.2.0_alpha51~3
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=72137f634878c4b0ef54287dd4a33fa2240a68f7;p=portage.git

resume_depgraph: prune all indirect unsatisfied

This should fix some cases of bug 378187.
---

diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index 5b48aca41..8b6125d84 100644
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -6869,12 +6869,12 @@ def _resume_depgraph(settings, trees, mtimedb, myopts, myparams, spinner):
 					if not isinstance(parent_node, Package) \
 						or parent_node.operation not in ("merge", "nomerge"):
 						continue
-					unsatisfied = \
-						graph.child_nodes(parent_node,
-						ignore_priority=DepPrioritySatisfiedRange.ignore_soft)
-					if pkg in unsatisfied:
-						unsatisfied_parents[parent_node] = parent_node
-						unsatisfied_stack.append(parent_node)
+					# We need to traverse all priorities here, in order to
+					# ensure that a package with an unsatisfied depenedency
+					# won't get pulled in, even indirectly via a soft
+					# dependency.
+					unsatisfied_parents[parent_node] = parent_node
+					unsatisfied_stack.append(parent_node)
 
 			unsatisfied_tuples = frozenset(tuple(parent_node)
 				for parent_node in unsatisfied_parents