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 1301f47595d56d4741a3e6e66abd12f9b67a0bd3..8d91b4b2ad12828ef9277a1be8c270f0b834683c 100755 (executable)
--- 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!"