diff options
author | Zac Medico <zmedico@gentoo.org> | 2007-02-19 07:08:50 +0000 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2007-02-19 07:08:50 +0000 |
commit | ef30ff5a9bfd928d0f83d23392fb1ef735e614dd (patch) | |
tree | d5a4d32a054334ed68e825c0bcd2f39ce2f58ce1 | |
parent | 572322c695b8a10f8f3640c251a4f26e47d4a651 (diff) | |
download | portage-ef30ff5a9bfd928d0f83d23392fb1ef735e614dd.tar.gz portage-ef30ff5a9bfd928d0f83d23392fb1ef735e614dd.tar.bz2 portage-ef30ff5a9bfd928d0f83d23392fb1ef735e614dd.zip |
Make digraph._merge_order_bias() operate on a single digraph that's passed in. (trunk r6011:6012)
svn path=/main/branches/2.1.2/; revision=6013
-rwxr-xr-x | bin/emerge | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/bin/emerge b/bin/emerge index c5ac0d4d1..c5d34aa8d 100755 --- a/bin/emerge +++ b/bin/emerge @@ -1967,15 +1967,15 @@ class depgraph: break return acceptable - def _merge_order_bias(self, nodes): + def _merge_order_bias(self, mygraph): """Order nodes from highest to lowest overall reference count for optimal leaf node selection.""" node_info = {} - for node in self._parent_child_digraph.order: - node_info[node] = len(self.digraph.parent_nodes(node)) + for node in mygraph.order: + node_info[node] = len(mygraph.parent_nodes(node)) def cmp_merge_preference(node1, node2): return node_info[node2] - node_info[node1] - nodes.sort(cmp_merge_preference) + mygraph.order.sort(cmp_merge_preference) def altlist(self, reversed=False): if reversed in self._altlist_cache: @@ -1986,7 +1986,7 @@ class depgraph: self._altlist_cache[reversed] = retlist[:] return retlist mygraph=self.digraph.copy() - self._merge_order_bias(mygraph.order) + self._merge_order_bias(mygraph) myblockers = self.blocker_digraph.copy() retlist=[] circular_blocks = False |