Add missing DepPriority instances to the graph so that the --buildpkgonly
authorZac Medico <zmedico@gentoo.org>
Fri, 4 Apr 2008 00:30:32 +0000 (00:30 -0000)
committerZac Medico <zmedico@gentoo.org>
Fri, 4 Apr 2008 00:30:32 +0000 (00:30 -0000)
hasallzeros() calculation works correctly again.

svn path=/main/trunk/; revision=9696

pym/_emerge/__init__.py

index 117bc448bd727284708133038836492af8e30ef8..33a4aed25c81bc9f93350788a65e9b0356e0d4da 100644 (file)
@@ -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: