summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2008-04-04 00:30:32 +0000
committerZac Medico <zmedico@gentoo.org>2008-04-04 00:30:32 +0000
commitb4cb2121cfff04d13d0f143d2ca6804e8f630c56 (patch)
tree9df149494d0fae1579d0317b5ed0274133843787
parent4b28146f1d0bbe35009879955b79d2d2d1900789 (diff)
downloadportage-b4cb2121cfff04d13d0f143d2ca6804e8f630c56.tar.gz
portage-b4cb2121cfff04d13d0f143d2ca6804e8f630c56.tar.bz2
portage-b4cb2121cfff04d13d0f143d2ca6804e8f630c56.zip
Add missing DepPriority instances to the graph so that the --buildpkgonly
hasallzeros() calculation works correctly again. svn path=/main/trunk/; revision=9696
-rw-r--r--pym/_emerge/__init__.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index 117bc448b..33a4aed25 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -1784,7 +1784,8 @@ class depgraph(object):
# The existing node can be reused.
if args:
for arg in args:
- self.digraph.add(existing_node, arg)
+ self.digraph.add(existing_node, arg,
+ priority=priority)
# If a direct circular dependency is not an unsatisfied
# buildtime dependency then drop it here since otherwise
# it can skew the merge order calculation in an unwanted
@@ -1853,10 +1854,10 @@ class depgraph(object):
# parent/child relationship is always known in case
# self._show_slot_collision_notice() needs to be called later.
if pkg.onlydeps:
- self.digraph.add(pkg, myparent)
+ self.digraph.add(pkg, myparent, priority=priority)
if args:
for arg in args:
- self.digraph.add(pkg, arg)
+ self.digraph.add(pkg, arg, priority=priority)
""" This section determines whether we go deeper into dependencies or not.
We want to go deeper on a few occasions: