From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 11 Jul 2011 17:17:08 +0000 (-0700)
Subject: resume_depgraph: fix breakage from reposyntax
X-Git-Tag: v2.2.0_alpha44~17
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5d8804712e9f49308f17f7fbb889edb048fa6c3a;p=portage.git

resume_depgraph: fix breakage from reposyntax

This is a major regression that has been triggering lots of complaints
about emerge --keep-going.
---

diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index a4b04f698..549ce7f2e 100644
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -6879,10 +6879,12 @@ 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)
 			pruned_mergelist = []
 			for x in mergelist:
 				if isinstance(x, list) and \
-					tuple(x) not in unsatisfied_parents:
+					tuple(x) not in unsatisfied_tuples:
 					pruned_mergelist.append(x)
 
 			# If the mergelist doesn't shrink then this loop is infinite.