patrick/zfs_autobackup
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleaning up

Browse Source
This commit is contained in:
Marius van Witzenburg
2017-07-05 13:05:07 +02:00
parent 6b5edab09d
commit 3e694e0928
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
zfs_autobackup
View File

@ -274,7 +274,6 @@ def zfs_transfer(ssh_source, source_filesystem, first_snapshot, second_snapshot,
else: else:
debug(debug_txt) debug(debug_txt)
# FIXME could break on spaces
source_proc=subprocess.Popen(source_cmd, env=os.environ, stdout=subprocess.PIPE) source_proc=subprocess.Popen(source_cmd, env=os.environ, stdout=subprocess.PIPE)
target_proc=subprocess.Popen(target_cmd, env=os.environ, stdin=source_proc.stdout) target_proc=subprocess.Popen(target_cmd, env=os.environ, stdin=source_proc.stdout)
source_proc.stdout.close() # Allow p1 to receive a SIGPIPE if p2 exits. source_proc.stdout.close() # Allow p1 to receive a SIGPIPE if p2 exits.
@ -538,7 +537,7 @@ target_obsolete_snapshots.update(stale_target_snapshots)
stale_target_destroys=[] stale_target_destroys=[]
for stale_target_filesystem in stale_target_filesystems: for stale_target_filesystem in stale_target_filesystems:
if stale_target_filesystem not in stale_target_snapshots: if stale_target_filesystem not in stale_target_snapshots:
stale_target_destroys.append(stale_target_filesystem) stale_target_destroys.append(stale_target_filesystem)
if stale_target_destroys: if stale_target_destroys:
if args.destroy_stale: if args.destroy_stale: