diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-03-11 05:18:22 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-03-11 05:18:22 +0000 |
| commit | 879d15de61ebd4979db5b94fcb240108ab629917 (patch) | |
| tree | 206728484a98656ec771a0d6e7960e05ba916b86 /pym/_emerge | |
| parent | cdf8415c87bd8fcb219fc40e67912e2d7f7ddeb1 (diff) | |
| download | portage-879d15de61ebd4979db5b94fcb240108ab629917.tar.gz portage-879d15de61ebd4979db5b94fcb240108ab629917.tar.bz2 portage-879d15de61ebd4979db5b94fcb240108ab629917.zip | |
Fix broken references to DepPriority attributes. (trunk r12619)
svn path=/main/branches/2.1.6/; revision=12894
Diffstat (limited to 'pym/_emerge')
| -rw-r--r-- | pym/_emerge/__init__.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index b1e38a918..51a2df888 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -7434,7 +7434,7 @@ class depgraph(object): # have no parents and thus can not be part of a cycle. while True: root_nodes = mygraph.root_nodes( - ignore_priority=DepPriority.MEDIUM_SOFT) + ignore_priority=DepPrioritySatisfiedRange.ignore_medium_soft) if not root_nodes: break mygraph.difference_update(root_nodes) @@ -13636,7 +13636,7 @@ def resume_depgraph(settings, trees, mtimedb, myopts, myparams, spinner): continue unsatisfied = \ graph.child_nodes(parent_node, - ignore_priority=DepPriority.SOFT) + ignore_priority=DepPrioritySatisfiedRange.ignore_soft) if pkg in unsatisfied: unsatisfied_parents[parent_node] = parent_node unsatisfied_stack.append(parent_node) @@ -14012,7 +14012,8 @@ def action_build(settings, trees, mtimedb, node.operation == "nomerge": removed_nodes.add(node) graph_copy.difference_update(removed_nodes) - if not graph_copy.hasallzeros(ignore_priority=DepPriority.MEDIUM): + if not graph_copy.hasallzeros(ignore_priority = \ + DepPrioritySatisfiedRange.ignore_medium): print "\n!!! --buildpkgonly requires all dependencies to be merged." print "!!! You have to merge the dependencies before you can build this package.\n" return 1 @@ -14025,7 +14026,8 @@ def action_build(settings, trees, mtimedb, node.operation == "nomerge": removed_nodes.add(node) graph_copy.difference_update(removed_nodes) - if not graph_copy.hasallzeros(ignore_priority=DepPriority.MEDIUM): + if not graph_copy.hasallzeros(ignore_priority = \ + DepPrioritySatisfiedRange.ignore_medium): print "\n!!! --buildpkgonly requires all dependencies to be merged." print "!!! Cannot merge requested packages. Merge deps and try again.\n" return 1 |