aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2011-07-11 17:17:08 (GMT)
committerZac Medico <zmedico@gentoo.org>2011-07-11 17:17:08 (GMT)
commit5d8804712e9f49308f17f7fbb889edb048fa6c3a (patch)
tree32e0d047e4b7d6683d994a588ccfe06a1656b83b
parentelog/mod_save: use _ensure_log_subdirs (diff)
downloadportage-5d8804712e9f49308f17f7fbb889edb048fa6c3a.zip
portage-5d8804712e9f49308f17f7fbb889edb048fa6c3a.tar.gz
portage-5d8804712e9f49308f17f7fbb889edb048fa6c3a.tar.bz2
resume_depgraph: fix breakage from reposyntax
This is a major regression that has been triggering lots of complaints about emerge --keep-going.
-rw-r--r--pym/_emerge/depgraph.py4
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.