diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-07-11 10:17:08 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-07-11 10:17:08 -0700 |
| commit | 5d8804712e9f49308f17f7fbb889edb048fa6c3a (patch) | |
| tree | 32e0d047e4b7d6683d994a588ccfe06a1656b83b | |
| parent | 4d689ffbe80b8d5038cc0105ace69de7b80e6cb1 (diff) | |
| download | portage-5d8804712e9f49308f17f7fbb889edb048fa6c3a.tar.gz portage-5d8804712e9f49308f17f7fbb889edb048fa6c3a.tar.bz2 portage-5d8804712e9f49308f17f7fbb889edb048fa6c3a.zip | |
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.py | 4 |
1 files changed, 3 insertions, 1 deletions
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. |