Explicitly set the priority when a node is added to enforce merge order for blocker...

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

diff --git a/bin/emerge b/bin/emerge
index d68d793bcd9e1b1ae2d48d94fc2915e04186752a..8f0d4510c0829ece36d6978bf4aeddc8249cdba5 100755 (executable)
--- a/bin/emerge
+++ b/bin/emerge
@@ -1449,7 +1449,8 @@ class depgraph:
                                                        continue
                                                # Enforce correct merge order with a hard dep.
                                                node = self.pkg_node_map[pkg]
-                                               self.digraph.addnode(node, parent)
+                                               self.digraph.addnode(node, parent,
+                                                       priority=DepPriority(buildtime=True))
                                                """Count references to this blocker so that it can be
                                                invalidated after nodes referencing it have been merged."""
                                                self.blocker_digraph.addnode(node, blocker)