resume_depgraph: fix breakage from reposyntax
authorZac Medico <zmedico@gentoo.org>
Mon, 11 Jul 2011 17:17:08 +0000 (10:17 -0700)
committerZac Medico <zmedico@gentoo.org>
Mon, 11 Jul 2011 17:17:08 +0000 (10:17 -0700)
This is a major regression that has been triggering lots of complaints
about emerge --keep-going.

pym/_emerge/depgraph.py

index a4b04f6982942ce01281ec93df56ca6b1c10ea40..549ce7f2eadfd2c517cab66eb0780c51dbbc4a36 100644 (file)
@@ -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.