diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-03-30 22:05:04 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-03-30 22:05:04 +0000 |
| commit | 0242efb5ec97e2c8260b6dca3eb58a7cfcc62a47 (patch) | |
| tree | 09f6c831a0d4251ab42ad39984cefff4d47737c9 /bin | |
| parent | b5f8d723508b43f4c37e1aa46161fcb5ba56450e (diff) | |
| download | portage-0242efb5ec97e2c8260b6dca3eb58a7cfcc62a47.tar.gz portage-0242efb5ec97e2c8260b6dca3eb58a7cfcc62a47.tar.bz2 portage-0242efb5ec97e2c8260b6dca3eb58a7cfcc62a47.zip | |
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
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/emerge | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/bin/emerge b/bin/emerge index cdf020f44..0ed369fe5 100755 --- 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: |