Revert r11839 since it's not necessarily desired to invert all uninstall
authorZac Medico <zmedico@gentoo.org>
Mon, 10 Nov 2008 16:41:05 +0000 (16:41 -0000)
committerZac Medico <zmedico@gentoo.org>
Mon, 10 Nov 2008 16:41:05 +0000 (16:41 -0000)
edges. TODO: Invert only the specific edges that the depgraph has decided
are necessary and allowed to be inverted.

svn path=/main/trunk/; revision=11844

pym/_emerge/__init__.py

index 90996af2b059f3a8d69c1f085fbf4d7ae4d258de..74f07ec050ed815a12a6375dc7b5b6e762c77eb1 100644 (file)
@@ -9261,10 +9261,11 @@ class Scheduler(PollScheduler):
 
                graph = self._digraph
 
-               # Iterate over all nodes rather than just the merge list, because
-               # some uninstall nodes may not be in the merge list since they will
-               # be performed as part of an upgrade within a slot.
-               for node in graph.all_nodes():
+               # TODO: Invert specific edges that the depgraph has decided are
+               # necessary and allowed to be inverted. Currently the below code
+               # does not invert edges for uninstalls that happen as part of an
+               # upgrade with in a slot (though it should).
+               for node in self._mergelist:
                        if not isinstance(node, Package) or \
                                node.operation != "uninstall":
                                continue