From 36062fb6b1fe1d7e9aca6ba95b36e322d0e863a8 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Mon, 10 Nov 2008 16:41:05 +0000 Subject: Revert r11839 since it's not necessarily desired to invert all uninstall 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 | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'pym/_emerge') diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index 90996af2b..74f07ec05 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -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 -- cgit v1.2.3-1-g7c22