Delete incomplete resume data before exiting due to blockers. This prevents a 'merge...

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

diff --git a/bin/emerge b/bin/emerge
index 0eae18a67422e0aa93f00d104a4cbdc93b9584e9..80eb2bb21111814be66cb88aebf15f164e696809 100755 (executable)
--- 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)