diff options
| author | Thomas Waldmann <tw@waldmann-edv.de> | 2024-03-24 15:14:14 +0100 |
|---|---|---|
| committer | Thomas Waldmann <tw@waldmann-edv.de> | 2024-03-24 15:14:14 +0100 |
| commit | 6154a83355b4b6c110f7595d6730d2a6485905cd (patch) | |
| tree | e09d36d1c7ea09b600274d4ed6feac0acff92cc9 | |
| parent | a09085c4e2dca0be16b549bcd75cf80f786c7cd6 (diff) | |
upgrade --check-archives-tam: rc=1 for archive TAM issues
also: better messages about global status.
| -rw-r--r-- | src/borg/archiver.py | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/borg/archiver.py b/src/borg/archiver.py index 80ee51666..bc1497d24 100644 --- a/src/borg/archiver.py +++ b/src/borg/archiver.py @@ -1639,6 +1639,7 @@ class Archiver: def do_upgrade(self, args, repository, manifest=None, key=None): """upgrade a repository from a previous version""" if args.archives_tam or args.check_archives_tam: + archive_tam_issues = 0 read_only = args.check_archives_tam manifest, key = Manifest.load(repository, (Manifest.Operation.CHECK,), force_tam_not_required=args.force) with Cache(repository, key, manifest) as cache: @@ -1662,12 +1663,23 @@ class Archiver: print(f"Added archive TAM: {archive_formatted} -> [{bin_to_hex(new_archive_id)}]") else: print(f"Archive TAM missing: {archive_formatted}") + archive_tam_issues += 1 else: print(f"Archive TAM present: {archive_formatted}") if not read_only: manifest.write() repository.commit(compact=False) cache.commit() + if archive_tam_issues > 0: + print(f"Fixed {archive_tam_issues} archives with TAM issues!") + print("All archives are TAM authenticated now.") + else: + print("All archives are TAM authenticated.") + else: + if archive_tam_issues > 0: + self.print_warning(f"Found {archive_tam_issues} archives with TAM issues!") + else: + print("All archives are TAM authenticated.") elif args.tam: manifest, key = Manifest.load(repository, (Manifest.Operation.CHECK,), force_tam_not_required=args.force) if not manifest.tam_verified or not manifest.config.get(b'tam_required', False): |