From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 12 Jul 2011 19:26:47 +0000 (-0700)
Subject: resume_depgraph: be careful with parent_node type
X-Git-Tag: v2.2.0_alpha44~9
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c12225b59b6ba336a05b5e0b07bd3b51b9d2f012;p=portage.git

resume_depgraph: be careful with parent_node type
---

diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index 8219a7738..a5923ddf6 100644
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -6881,8 +6881,9 @@ def _resume_depgraph(settings, trees, mtimedb, myopts, myparams, spinner):
 						unsatisfied_parents[parent_node] = parent_node
 						unsatisfied_stack.append(parent_node)
 
-			unsatisfied_tuples = set(tuple(pkg)
-				for pkg in unsatisfied_parents)
+			unsatisfied_tuples = frozenset(tuple(parent_node)
+				for parent_node in unsatisfied_parents
+				if isinstance(parent_node, Package))
 			pruned_mergelist = []
 			for x in mergelist:
 				if isinstance(x, list) and \