| 1 |
commit: c12225b59b6ba336a05b5e0b07bd3b51b9d2f012 |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jul 12 19:26:47 2011 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jul 12 19:26:47 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=c12225b5 |
| 7 |
|
| 8 |
resume_depgraph: be careful with parent_node type |
| 9 |
|
| 10 |
--- |
| 11 |
pym/_emerge/depgraph.py | 5 +++-- |
| 12 |
1 files changed, 3 insertions(+), 2 deletions(-) |
| 13 |
|
| 14 |
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py |
| 15 |
index 8219a77..a5923dd 100644 |
| 16 |
--- a/pym/_emerge/depgraph.py |
| 17 |
+++ b/pym/_emerge/depgraph.py |
| 18 |
@@ -6881,8 +6881,9 @@ def _resume_depgraph(settings, trees, mtimedb, myopts, myparams, spinner): |
| 19 |
unsatisfied_parents[parent_node] = parent_node |
| 20 |
unsatisfied_stack.append(parent_node) |
| 21 |
|
| 22 |
- unsatisfied_tuples = set(tuple(pkg) |
| 23 |
- for pkg in unsatisfied_parents) |
| 24 |
+ unsatisfied_tuples = frozenset(tuple(parent_node) |
| 25 |
+ for parent_node in unsatisfied_parents |
| 26 |
+ if isinstance(parent_node, Package)) |
| 27 |
pruned_mergelist = [] |
| 28 |
for x in mergelist: |
| 29 |
if isinstance(x, list) and \ |
Archives