From: Zac Medico <zmedico@gentoo.org>
Date: Sun, 30 Mar 2008 22:05:04 +0000 (-0000)
Subject: Make sure the all resume lists are deleted when a stale one is encountered.
X-Git-Tag: v2.1.5~278
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0242efb5ec97e2c8260b6dca3eb58a7cfcc62a47;p=portage.git

Make sure the all resume lists are deleted when a stale one is encountered.
(trunk r9636)

svn path=/main/branches/2.1.2/; revision=9639
---

diff --git a/bin/emerge b/bin/emerge
index cdf020f44..0ed369fe5 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -6417,7 +6417,11 @@ def action_build(settings, trees, mtimedb,
 			out.eerror("Error: The resume list contains packages that are no longer")
 			out.eerror("       available to be emerged. Please restart/continue")
 			out.eerror("       the merge operation manually.")
-			del mtimedb["resume"]
+
+			# delete the current list and also the backup
+			# since it's probably stale too.
+			for k in ("resume", "resume_backup"):
+				mtimedb.pop(k, None)
 			mtimedb.commit()
 			return 1
 		if show_spinner: