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 c22041abfa654b9cd21674f9230e3213ebac2e5b..43eaa43009bd83d59df799593d57c626c95430b9 100644 (file)
--- 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: