From d43b47b4a891ef198c84d2fead4ceba18a01ecea Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Wed, 18 Oct 2006 11:35:17 +0000 Subject: [PATCH] Explicitly set the priority when a node is added to enforce merge order for blocker avoidance. svn path=/main/trunk/; revision=4752 --- bin/emerge | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bin/emerge b/bin/emerge index d68d793bc..8f0d4510c 100755 --- 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) -- 2.26.2