From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 29 Mar 2008 07:08:00 +0000 (-0000)
Subject: When a resume list contains packages that are no longer available,
X-Git-Tag: v2.1.5~300
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c6dcc38f002ac117dbdd9710fe9dbc90610bba56;p=portage.git

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

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

diff --git a/bin/emerge b/bin/emerge
index 1301f4759..8d91b4b2a 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -6433,6 +6433,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!"