| 1 |
Author: zmedico |
| 2 |
Date: 2008-03-30 22:05:04 +0000 (Sun, 30 Mar 2008) |
| 3 |
New Revision: 9639 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/2.1.2/bin/emerge |
| 7 |
Log: |
| 8 |
Make sure the all resume lists are deleted when a stale one is encountered. |
| 9 |
(trunk r9636) |
| 10 |
|
| 11 |
|
| 12 |
Modified: main/branches/2.1.2/bin/emerge |
| 13 |
=================================================================== |
| 14 |
--- main/branches/2.1.2/bin/emerge 2008-03-30 22:03:56 UTC (rev 9638) |
| 15 |
+++ main/branches/2.1.2/bin/emerge 2008-03-30 22:05:04 UTC (rev 9639) |
| 16 |
@@ -6417,7 +6417,11 @@ |
| 17 |
out.eerror("Error: The resume list contains packages that are no longer") |
| 18 |
out.eerror(" available to be emerged. Please restart/continue") |
| 19 |
out.eerror(" the merge operation manually.") |
| 20 |
- del mtimedb["resume"] |
| 21 |
+ |
| 22 |
+ # delete the current list and also the backup |
| 23 |
+ # since it's probably stale too. |
| 24 |
+ for k in ("resume", "resume_backup"): |
| 25 |
+ mtimedb.pop(k, None) |
| 26 |
mtimedb.commit() |
| 27 |
return 1 |
| 28 |
if show_spinner: |
| 29 |
|
| 30 |
-- |
| 31 |
gentoo-commits@l.g.o mailing list |
Archives