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

fixed space handling in dataset names for remote commands

Browse Source
This commit is contained in:
Edwin Eefting
2017-07-26 04:01:21 +02:00
parent d78d1ec05e
commit 5919ce9d4d
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
zfs_autobackup
View File

@ -33,6 +33,7 @@ def run(cmd, input=None, ssh_to="local", tab_split=False, valid_exitcodes=[ 0 ],
encoded_cmd=[] encoded_cmd=[]
#use ssh? #use ssh?
if ssh_to != "local": if ssh_to != "local":
encoded_cmd.extend(["ssh", ssh_to]) encoded_cmd.extend(["ssh", ssh_to])
@ -41,14 +42,22 @@ def run(cmd, input=None, ssh_to="local", tab_split=False, valid_exitcodes=[ 0 ],
if args.compress: if args.compress:
encoded_cmd.append("-C") encoded_cmd.append("-C")
#make sure the command gets all the data in utf8 format: #make sure the command gets all the data in utf8 format:
#(this is neccesary if LC_ALL=en_US.utf8 is not set in the environment) #(this is neccesary if LC_ALL=en_US.utf8 is not set in the environment)
for arg in cmd:
#add single quotes for remote commands to support spaces and other wierd stuff (remote commands are executed in a shell)
encoded_cmd.append( ("'"+arg+"'").encode('utf-8'))
else:
for arg in cmd: for arg in cmd:
encoded_cmd.append(arg.encode('utf-8')) encoded_cmd.append(arg.encode('utf-8'))
#the accurate way of displaying it whould be: print encoded_cmd #the accurate way of displaying it whould be: print encoded_cmd
#However, we use the more human-readable way, but this is not always properly escaped! #However, we use the more human-readable way, but this is not always properly escaped!
#(most of the time it should be copypastable however.) #(most of the time it should be copypastable however.)
debug_txt="# "+encoded_cmd[0]+" '"+("' '".join(encoded_cmd[1:]))+"'" debug_txt="# "+" ".join(encoded_cmd)
if test: if test:
debug("[TEST] "+debug_txt) debug("[TEST] "+debug_txt)