summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-06-08 13:57:03 +0000
committerZac Medico <zmedico@gentoo.org>2006-06-08 13:57:03 +0000
commit95dff2d9a18a626411caea84243a23871b4ed882 (patch)
tree4ac2381edf00fe0909e257e95d719e42947651f4
parenta70eee90b48de75625e86135ed722cf9e5663740 (diff)
downloadportage-95dff2d9a18a626411caea84243a23871b4ed882.tar.gz
portage-95dff2d9a18a626411caea84243a23871b4ed882.tar.bz2
portage-95dff2d9a18a626411caea84243a23871b4ed882.zip
Delete incomplete resume data before exiting due to blockers. This prevents a 'mergelist' KeyError from occurring if the user attempts to run `emerge --resume` immediately afterwards. Thanks to axxo for reporting.
svn path=/main/trunk/; revision=3471
-rwxr-xr-xbin/emerge4
1 files changed, 4 insertions, 0 deletions
diff --git a/bin/emerge b/bin/emerge
index 0eae18a67..80eb2bb21 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -1853,6 +1853,10 @@ class depgraph:
print "!!! Please use 'emerge --pretend' to determine blockers."
print
if ("--pretend" not in myopts):
+ try:
+ del portage.mtimedb["resume"]
+ except KeyError:
+ pass
sys.exit(1)
#buildsyspkg: I need mysysdict also on resume (moved from the else block)