[patch] fix regression from reposyntax changes

resume.patch (text/plain), 1.09 KB, created by Zac Medico on 2011-07-11 17:21:48 UTC

From 5d8804712e9f49308f17f7fbb889edb048fa6c3a Mon Sep 17 00:00:00 2001
From: Zac Medico <[e-mail]>
Date: Mon, 11 Jul 2011 10:17:08 -0700
Subject: [PATCH] resume_depgraph: fix breakage from reposyntax

This is a major regression that has been triggering lots of complaints
about emerge --keep-going.
---
 pym/_emerge/depgraph.py |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index a4b04f6..549ce7f 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.
-- 
1.7.6