From fca647b3aed0c015346c0b09a8cb92fe6b464f48 Mon Sep 17 00:00:00 2001 From: Dan Helfman Date: Wed, 3 Sep 2025 16:52:26 -0700 Subject: [PATCH] Fix broken fallback to dump path introspection when dumps.json is missing. Also add additional logging. --- borgmatic/actions/restore.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/borgmatic/actions/restore.py b/borgmatic/actions/restore.py index 4a0e5499..553acadb 100644 --- a/borgmatic/actions/restore.py +++ b/borgmatic/actions/restore.py @@ -278,6 +278,9 @@ def collect_dumps_from_archive( local_path=local_path, remote_path=remote_path, ): + if not dumps_metadata_path: + continue + dumps_from_archive.update( set( borgmatic.hooks.data_source.dump.parse_data_source_dumps_metadata( @@ -302,10 +305,13 @@ def collect_dumps_from_archive( # If we've successfully loaded any dumps metadata, we're done. if dumps_from_archive: + logger.debug(f'Collecting database dumps from archive data source dumps metadata files') + return dumps_from_archive # No dumps metadata files were found, so for backwards compatibility, fall back to parsing the # paths of dumps found in the archive to get their respective dump metadata. + logger.debug(f'Collecting database dumps from archive data source dump paths') borgmatic_source_directory = str( pathlib.Path(borgmatic.config.paths.get_borgmatic_source_directory(config)), )