From 50070bc70f4bf99b481dc1c067a83b7084e2e3da Mon Sep 17 00:00:00 2001 From: Edwin Eefting Date: Tue, 2 Feb 2021 21:21:09 +0100 Subject: [PATCH] fix #61 --- bin/zfs-autobackup | 5 ++--- run_tests | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/bin/zfs-autobackup b/bin/zfs-autobackup index 0857cc9..6f084c4 100755 --- a/bin/zfs-autobackup +++ b/bin/zfs-autobackup @@ -23,7 +23,7 @@ if sys.stdout.isatty(): colorama = False 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) @@ -922,7 +922,7 @@ class ZfsDataset: # incremental? if prev_snapshot: - cmd.extend(["-i", prev_snapshot.snapshot_name]) + cmd.extend(["-i", "@"+prev_snapshot.snapshot_name]) cmd.append(self.name) @@ -1187,7 +1187,6 @@ class ZfsDataset: if self.our_snapshots: (source_keeps, source_obsoletes) = self.thin_list(keeps=[self.our_snapshots[-1]]) else: - source_keeps = [] source_obsoletes = [] if target_dataset.our_snapshots: diff --git a/run_tests b/run_tests index 390c536..a836095 100755 --- a/run_tests +++ b/run_tests @@ -16,7 +16,7 @@ if ! [ -e /root/.ssh/id_rsa ]; then ssh -oStrictHostKeyChecking=no localhost true || exit 1 fi -coverage run --source bin.zfs_autobackup -m unittest discover -vv $@ +coverage run --source bin.zfs_autobackup -m unittest discover -vvvvf $@ 2>&1 EXIT=$? echo