summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-02-15 19:14:46 +0000
committerZac Medico <zmedico@gentoo.org>2009-02-15 19:14:46 +0000
commit5ab45d760b1450f3d875cf012ef28e9f833ea2dc (patch)
tree54af5774428ebfbc51d6fd0b7eea3b5f0bb64465
parent084c9e85f76ed5c5ef1178fafb0df180437e71b1 (diff)
downloadportage-5ab45d760b1450f3d875cf012ef28e9f833ea2dc.tar.gz
portage-5ab45d760b1450f3d875cf012ef28e9f833ea2dc.tar.bz2
portage-5ab45d760b1450f3d875cf012ef28e9f833ea2dc.zip
Fix broken references to DepPriority attributes.
svn path=/main/trunk/; revision=12619
-rw-r--r--pym/_emerge/__init__.py10
1 files changed, 6 insertions, 4 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index c10f23b26..822672f3f 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -7450,7 +7450,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)
@@ -13990,7 +13990,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)
@@ -14366,7 +14366,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
@@ -14379,7 +14380,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