From 49eb2c6e72a0adaf64e3fb6efdb8d58e49879aaf Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Wed, 6 Oct 2010 11:37:36 -0700 Subject: Backtracker reverses backtrack_data now. Since commit 9ff5e9731142d389373ea6ebc949919c3b637110, Backtracker._feedback_slot_conflict() adds nodes in the order of backtrack_data and this order is then reversed when the nodes are popped from _unexplored_nodes. --- pym/_emerge/depgraph.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'pym') diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index 78d517cf9..ab34a411a 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -882,10 +882,9 @@ class depgraph(object): # of that, we choose an order such that # the backtracker will first explore the choice with # existing_node masked. The backtracker reverses the - # order twice, so the order it uses is the order shown - # here (the net result of two reversals is the same as - # no reversal). See bug #339606. - for to_be_selected, to_be_masked in (pkg, existing_node), (existing_node, pkg): + # order, so the order it uses is the reverse of the + # order shown here. See bug #339606. + for to_be_selected, to_be_masked in (existing_node, pkg), (pkg, existing_node): # For missed update messages, find out which # atoms matched to_be_selected that did not # match to_be_masked. -- cgit v1.2.3-1-g7c22