From: Zac Medico <zmedico@gentoo.org>
Date: Sun, 30 Mar 2008 21:40:42 +0000 (-0000)
Subject: Make sure the all resume lists are deleted when a stale one is encountered.
X-Git-Tag: v2.2_pre6~291
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=906410be8ebb31fc185cd1c7d49bd5244fe5434e;p=portage.git

Make sure the all resume lists are deleted when a stale one is encountered.

svn path=/main/trunk/; revision=9636
---

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index c22041abf..43eaa4300 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -6885,7 +6885,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: