summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2008-05-10 08:07:58 +0000
committerZac Medico <zmedico@gentoo.org>2008-05-10 08:07:58 +0000
commit3b96a315473cb4d06f6ee432370328b14b78ea8e (patch)
tree3253cd6164d925c42ccc596627b98fabffe2aeee
parent5f8664ad3e8073f6b1a715685755f7727216c901 (diff)
downloadportage-3b96a315473cb4d06f6ee432370328b14b78ea8e.tar.gz
portage-3b96a315473cb4d06f6ee432370328b14b78ea8e.tar.bz2
portage-3b96a315473cb4d06f6ee432370328b14b78ea8e.zip
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
-rwxr-xr-xbin/emerge2
1 files changed, 0 insertions, 2 deletions
diff --git a/bin/emerge b/bin/emerge
index c4cdd7d38..6cefe9bcb 100755
--- 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 \