fix upgrade --tam crashing if repository is not encrypted

This commit is contained in:
Marian Beermann 2017-01-03 17:15:32 +01:00
parent 9d7ec9aa0a
commit 6a5b3018c1
2 changed files with 6 additions and 0 deletions

View File

@ -730,6 +730,10 @@ class Archiver:
if args.tam:
manifest, key = Manifest.load(repository, force_tam_not_required=args.force)
if not hasattr(key, 'change_passphrase'):
print('This repository is not encrypted, cannot enable TAM.')
return EXIT_ERROR
if not manifest.tam_verified or not manifest.config.get(b'tam_required', False):
# The standard archive listing doesn't include the archive ID like in borg 1.1.x
print('Manifest contents:')

View File

@ -133,6 +133,8 @@ Bug fixes:
- Avoid triggering an ObjectiveFS bug in xattr retrieval, #1992
- When running out of buffer memory when reading xattrs, only skip the current file, #1993
- Fixed "borg upgrade --tam" crashing with unencrypted repositories. Since :ref:`the issue <tam_vuln>` is
not relevant for unencrypted repositories, it now does nothing and prints an error, #1981.
Version 1.0.9 (2016-12-20)
--------------------------