summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2008-03-30 21:40:42 +0000
committerZac Medico <zmedico@gentoo.org>2008-03-30 21:40:42 +0000
commit906410be8ebb31fc185cd1c7d49bd5244fe5434e (patch)
tree8187e134942d3472da5560fa27ef402fa6d7ba94
parent5b9c3611b8dd07c731abf4cb1665163bf627df03 (diff)
downloadportage-906410be8ebb31fc185cd1c7d49bd5244fe5434e.tar.gz
portage-906410be8ebb31fc185cd1c7d49bd5244fe5434e.tar.bz2
portage-906410be8ebb31fc185cd1c7d49bd5244fe5434e.zip
Make sure the all resume lists are deleted when a stale one is encountered.
svn path=/main/trunk/; revision=9636
-rw-r--r--pym/_emerge/__init__.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index c22041abf..43eaa4300 100644
--- 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: