From 748e6d473930b60d31e3f586f5af44f6ad08d2cf Mon Sep 17 00:00:00 2001 From: Marius van Witzenburg Date: Wed, 5 Jul 2017 12:14:51 +0200 Subject: [PATCH] Handle local and remote dataset escaping differently --- zfs_autobackup | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/zfs_autobackup b/zfs_autobackup index faf87e4..dd4ac48 100755 --- a/zfs_autobackup +++ b/zfs_autobackup @@ -228,7 +228,10 @@ def zfs_transfer(ssh_source, source_filesystem, first_snapshot, second_snapshot, verbose("Tranferring "+source_filesystem+" incremental backup between snapshots "+first_snapshot+"..."+second_snapshot) source_cmd.extend([ "-i", first_snapshot ]) # FIXME needs attention - source_cmd.append(source_filesystem.replace(' ', '\ ') + "@" + second_snapshot) + if ssh_source != "local": + source_cmd.append(source_filesystem.replace(' ', '\ ') + "@" + second_snapshot) + else: + source_cmd.append(source_filesystem + "@" + second_snapshot) # if ssh_source != "local": # #add buffer @@ -251,8 +254,10 @@ def zfs_transfer(ssh_source, source_filesystem, first_snapshot, second_snapshot, if args.verbose or args.debug: target_cmd.append("-v") # FIXME needs attention - target_cmd.append(target_filesystem.replace(' ', '\ ')) - + if ssh_target != "local": + target_cmd.append(target_filesystem.replace(' ', '\ ')) + else: + target_cmd.append(target_filesystem) #### make sure parent on target exists parent_filesystem= "/".join(target_filesystem.split("/")[:-1])