From 95dff2d9a18a626411caea84243a23871b4ed882 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Thu, 8 Jun 2006 13:57:03 +0000 Subject: 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 --- bin/emerge | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'bin/emerge') 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) -- cgit v1.2.3-1-g7c22