diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-11-10 16:41:05 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-11-10 16:41:05 +0000 |
| commit | 36062fb6b1fe1d7e9aca6ba95b36e322d0e863a8 (patch) | |
| tree | 669f255c0e2a3b4246ea94bc14d8fe7b9fb7528f | |
| parent | bb9d3b0b53bded18941f12b6e2445d680fb431bb (diff) | |
| download | portage-36062fb6b1fe1d7e9aca6ba95b36e322d0e863a8.tar.gz portage-36062fb6b1fe1d7e9aca6ba95b36e322d0e863a8.tar.bz2 portage-36062fb6b1fe1d7e9aca6ba95b36e322d0e863a8.zip | |
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
| -rw-r--r-- | pym/_emerge/__init__.py | 9 |
1 files changed, 5 insertions, 4 deletions
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 |