diff options
| author | Zac Medico <zmedico@gentoo.org> | 2006-10-18 11:35:17 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2006-10-18 11:35:17 +0000 |
| commit | d43b47b4a891ef198c84d2fead4ceba18a01ecea (patch) | |
| tree | 11b206a538b01ae6c9a6e133e6dc5daa652f42dd | |
| parent | 85e306a09766de460717033ae9aac05bc822b6af (diff) | |
| download | portage-d43b47b4a891ef198c84d2fead4ceba18a01ecea.tar.gz portage-d43b47b4a891ef198c84d2fead4ceba18a01ecea.tar.bz2 portage-d43b47b4a891ef198c84d2fead4ceba18a01ecea.zip | |
Explicitly set the priority when a node is added to enforce merge order for blocker avoidance.
svn path=/main/trunk/; revision=4752
| -rwxr-xr-x | bin/emerge | 3 |
1 files changed, 2 insertions, 1 deletions
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) |