Fix another KeyError, reported in Bug #221107, comment #4. There's no need

to remove uninstall tasks from scheduled_uninstalls, so just keep them
in there.

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

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index 7891c4426103690f1047ddcc8049644ccbe4bb93..15e57047e5068b2a879afa0a7bdf8b84f87df8f7 100644 (file)
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -4005,7 +4005,6 @@ class depgraph(object):
                                        "uninstall" == node.operation:
                                        have_uninstall_task = True
                                        uninst_task = node
-                                       scheduled_uninstalls.remove(uninst_task)
                                else:
                                        vardb = self.trees[node.root]["vartree"].dbapi
                                        previous_cpv = vardb.match(node.slot_atom)
@@ -4019,7 +4018,6 @@ class depgraph(object):
                                                        mygraph.remove(uninst_task)
                                                except KeyError:
                                                        pass
-                                               scheduled_uninstalls.discard(uninst_task)
 
                                if uninst_task is not None and \
                                        uninst_task not in ignored_uninstall_tasks and \