borgmatic-collective/borgmatic
borgmatic-collective/borgmatic
10
66
Fork 30
Code Issues 45 Pull Requests 4 Actions Packages Releases 145 Activity

Fix breakage of ZFS user property auto-backup (#80).

Browse Source
This commit is contained in:
Dan Helfman 2024-12-03 15:43:50 -08:00
parent 399bb6ef68
commit 347a4c3dd5
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
borgmatic/hooks/data_source/zfs.py
View File

@ -24,7 +24,7 @@ BORGMATIC_USER_PROPERTY = 'org.torsion.borgmatic:backup'
Dataset = collections.namedtuple(
'Dataset', ('name', 'mount_point', 'user_property_value', 'contained_source_directories')
'Dataset', ('name', 'mount_point', 'auto_backup', 'contained_source_directories')
)
@ -57,7 +57,7 @@ def get_datasets_to_backup(zfs_command, source_directories):
# directories.)
datasets = sorted(
(
Dataset(dataset_name, mount_point, user_property_value, ())
Dataset(dataset_name, mount_point, (user_property_value == 'auto'), ())
for line in list_output.splitlines()
for (dataset_name, mount_point, user_property_value) in (line.rstrip().split('\t'),)
),
@ -74,16 +74,19 @@ def get_datasets_to_backup(zfs_command, source_directories):
Dataset(
dataset.name,
dataset.mount_point,
dataset.user_property_value,
dataset.auto_backup,
contained_source_directories,
)
for dataset in datasets
for contained_source_directories in (
borgmatic.hooks.data_source.snapshot.get_contained_directories(
dataset.mount_point, candidate_source_directories
(
((dataset.mount_point,) if dataset.auto_backup else ())
+ borgmatic.hooks.data_source.snapshot.get_contained_directories(
dataset.mount_point, candidate_source_directories
)
),
)
if contained_source_directories or dataset.user_property_value == 'auto'
if contained_source_directories
),
key=lambda dataset: dataset.mount_point,
)