upstream/borgbackup
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2026-05-28 04:03:21 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

permit manifest version 2 as well 1 one.

Browse source
This commit is contained in:
Martin Hostettler 2017-03-12 11:04:26 +01:00
parent ca5ea4f53d
commit 7f57086223
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
borg/helpers.py
View file

@ -186,7 +186,7 @@ class Manifest:
data = key.decrypt(None, cdata)
m, manifest.tam_verified = key.unpack_and_verify_manifest(data, force_tam_not_required=force_tam_not_required)
manifest.id = key.id_hash(data)
if not m.get(b'version') == 1:
if m.get(b'version') not in (1, 2):
raise ValueError('Invalid manifest version')
manifest.archives = dict((k.decode('utf-8'), v) for k, v in m[b'archives'].items())
manifest.timestamp = m.get(b'timestamp')