From 2063da3b09da7dfa6f5e90ec17f05a552ebd8547 Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Wed, 7 May 2025 10:02:35 +0200 Subject: [PATCH] check/compact/analyze: show archive timestamp in local tz, fixes #8814 --- src/borg/archive.py | 4 +++- src/borg/archiver/analyze_cmd.py | 8 ++++++-- src/borg/archiver/compact_cmd.py | 4 +++- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/borg/archive.py b/src/borg/archive.py index 729cff6df..912a376f1 100644 --- a/src/borg/archive.py +++ b/src/borg/archive.py @@ -2059,7 +2059,9 @@ class ArchiveChecker: for i, info in enumerate(archive_infos): pi.show(i) archive_id, archive_id_hex = info.id, bin_to_hex(info.id) - logger.info(f"Analyzing archive {info.name} {info.ts} {archive_id_hex} ({i + 1}/{num_archives})") + logger.info( + f"Analyzing archive {info.name} {info.ts.astimezone()} {archive_id_hex} ({i + 1}/{num_archives})" + ) if archive_id not in self.chunks: logger.error(f"Archive metadata block {archive_id_hex} is missing!") self.error_found = True diff --git a/src/borg/archiver/analyze_cmd.py b/src/borg/archiver/analyze_cmd.py index a378c2de0..7b661d10d 100644 --- a/src/borg/archiver/analyze_cmd.py +++ b/src/borg/archiver/analyze_cmd.py @@ -43,11 +43,15 @@ class ArchiveAnalyzer: i = 0 info = archive_infos[i] pi.show(i) - logger.info(f"Analyzing archive {info.name} {info.ts} {bin_to_hex(info.id)} ({i + 1}/{num_archives})") + logger.info( + f"Analyzing archive {info.name} {info.ts.astimezone()} {bin_to_hex(info.id)} ({i + 1}/{num_archives})" + ) base = self.analyze_archive(info.id) for i, info in enumerate(archive_infos[1:]): pi.show(i + 1) - logger.info(f"Analyzing archive {info.name} {info.ts} {bin_to_hex(info.id)} ({i + 2}/{num_archives})") + logger.info( + f"Analyzing archive {info.name} {info.ts.astimezone()} {bin_to_hex(info.id)} ({i + 2}/{num_archives})" + ) new = self.analyze_archive(info.id) self.analyze_change(base, new) base = new diff --git a/src/borg/archiver/compact_cmd.py b/src/borg/archiver/compact_cmd.py index 6037fcfd8..4c9ab74f3 100644 --- a/src/borg/archiver/compact_cmd.py +++ b/src/borg/archiver/compact_cmd.py @@ -90,7 +90,9 @@ class ArchiveGarbageCollector: total_size, total_files = 0, 0 for i, info in enumerate(archive_infos): pi.show(i) - logger.info(f"Analyzing archive {info.name} {info.ts} {bin_to_hex(info.id)} ({i + 1}/{num_archives})") + logger.info( + f"Analyzing archive {info.name} {info.ts.astimezone()} {bin_to_hex(info.id)} ({i + 1}/{num_archives})" + ) archive = Archive(self.manifest, info.id) # archive metadata size unknown, but usually small/irrelevant: use_it(archive.id)