third-party-mirrors/zfs_autobackup
1
0
Fork 1
mirror of https://github.com/psy0rz/zfs_autobackup.git synced 2025-05-30 01:19:16 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix #61

Browse Source
This commit is contained in:
Edwin Eefting 2021-02-02 21:21:09 +01:00
parent bbe7a112fd
commit 50070bc70f
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bin/zfs-autobackup
View File

@ -23,7 +23,7 @@ if sys.stdout.isatty():
colorama = False colorama = False
pass pass
VERSION = "3.0.1-beta3" VERSION = "3.0.1-beta4"
HEADER = "zfs-autobackup v{} - Copyright 2020 E.H.Eefting (edwin@datux.nl)".format(VERSION) HEADER = "zfs-autobackup v{} - Copyright 2020 E.H.Eefting (edwin@datux.nl)".format(VERSION)
@ -922,7 +922,7 @@ class ZfsDataset:
# incremental? # incremental?
if prev_snapshot: if prev_snapshot:
cmd.extend(["-i", prev_snapshot.snapshot_name]) cmd.extend(["-i", "@"+prev_snapshot.snapshot_name])
cmd.append(self.name) cmd.append(self.name)
@ -1187,7 +1187,6 @@ class ZfsDataset:
if self.our_snapshots: if self.our_snapshots:
(source_keeps, source_obsoletes) = self.thin_list(keeps=[self.our_snapshots[-1]]) (source_keeps, source_obsoletes) = self.thin_list(keeps=[self.our_snapshots[-1]])
else: else:
source_keeps = []
source_obsoletes = [] source_obsoletes = []
if target_dataset.our_snapshots: if target_dataset.our_snapshots:

2
run_tests
View File

@ -16,7 +16,7 @@ if ! [ -e /root/.ssh/id_rsa ]; then
ssh -oStrictHostKeyChecking=no localhost true || exit 1 ssh -oStrictHostKeyChecking=no localhost true || exit 1
fi fi
coverage run --source bin.zfs_autobackup -m unittest discover -vv $@ coverage run --source bin.zfs_autobackup -m unittest discover -vvvvf $@ 2>&1
EXIT=$? EXIT=$?
echo echo