From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 29 Mar 2008 04:12:37 +0000 (-0000)
Subject: When a resume list contains packages that are no longer available,
X-Git-Tag: v2.2_pre6~309
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=8a22957bdf3408868bfc5de5d40d4b4dfbfa5a25;p=portage.git

When a resume list contains packages that are no longer available,
automatically delete it.

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

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index e28533be9..a4a0dc3d6 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -6911,6 +6911,8 @@ 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"]
+			mtimedb.commit()
 			return 1
 		if show_spinner:
 			print "\b\b... done!"