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 cdf020f441cd800c2178ab534f181d110f272426..0ed369fe5b3da4c22e567f178ff72e9c987dbb18 100755 (executable)
--- 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: