Merge lp:~mterry/duplicity/manifest-oddities into lp:duplicity/0.6
Status: | Merged |
---|---|
Merged at revision: | 934 |
Proposed branch: | lp:~mterry/duplicity/manifest-oddities |
Merge into: | lp:duplicity/0.6 |
Diff against target: |
64 lines (+37/-1) 2 files modified
duplicity/manifest.py (+12/-1) testing/tests/restarttest.py (+25/-0) |
To merge this branch: | bzr merge lp:~mterry/duplicity/manifest-oddities |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
duplicity-team | Pending | ||
Review via email: mp+195460@code.launchpad.net |
Description of the change
We may accidentally end up with an oddly inconsistent manifest like so:
Volume 1
Volume 2
Volume 3
Volume 2
As did get reported recently on the mailing list: http://
One way this can happen (the only way?) is if you back up, then duplicity gets interrupted between writing the manifest and uploading the volume. Then, when restarted, there is no longer enough data to create as many volumes as existed previously.
This situation can cause an exception when trying to restart the backup.
This branch fixes it by deleting any excess volume information encountered when loading in the manifest. We discard volume with higher numbers than the last one read.