Backtracker reverses backtrack_data now.
authorZac Medico <zmedico@gentoo.org>
Wed, 6 Oct 2010 18:37:36 +0000 (11:37 -0700)
committerZac Medico <zmedico@gentoo.org>
Wed, 6 Oct 2010 18:37:36 +0000 (11:37 -0700)
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

index 78d517cf9066a9d8e8413444fb4623596d70b0c5..ab34a411ae34b0a14dd80fd2812494fb36765108 100644 (file)
@@ -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.