Fix broken fallback to dump path introspection when dumps.json is missing. Also add additional logging.

This commit is contained in:
Dan Helfman
2025-09-03 16:52:26 -07:00
parent e02c4be493
commit fca647b3ae
+6
View File
@@ -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)),
)