From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 8 Jun 2006 13:57:03 +0000 (-0000)
Subject: Delete incomplete resume data before exiting due to blockers.  This prevents a 'merge... 
X-Git-Tag: v2.1~5
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=95dff2d9a18a626411caea84243a23871b4ed882;p=portage.git

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
---

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)