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. (trunk r10277)

svn path=/main/branches/2.1.2/; revision=10278

diff --git a/bin/emerge b/bin/emerge
index c4cdd7d381c25bc074691d0da4898af8ffbbdc38..6cefe9bcb5220dc83c9dfcb39cd810e6b995bb14 100755 (executable)
--- a/bin/emerge
+++ b/bin/emerge
@@ -4157,7 +4157,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)
@@ -4171,7 +4170,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 \