carroarmato0/ansible.posix
1
0
Fork 0
mirror of https://github.com/ansible-collections/ansible.posix.git synced 2026-01-11 23:25:28 +01:00
Code Issues Projects Releases Packages Wiki Activity

fixes #24 and #190

Browse source
This commit is contained in:
Robert Rettig 2021-06-24 23:37:48 +02:00
parent a994a58b23
commit 0118bf0cb9
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
plugins/modules/synchronize.py
View file

@ -548,10 +548,10 @@ def main():
ssh_cmd_str = ' '.join(shlex_quote(arg) for arg in ssh_cmd) ssh_cmd_str = ' '.join(shlex_quote(arg) for arg in ssh_cmd)
if ssh_args: if ssh_args:
ssh_cmd_str += ' %s' % ssh_args ssh_cmd_str += ' %s' % ssh_args
cmd.append('--rsh=%s' % ssh_cmd_str) cmd.append(shlex_quote('--rsh=%s' % ssh_cmd_str))
if rsync_path: if rsync_path:
cmd.append('--rsync-path=%s' % rsync_path) cmd.append(shlex_quote('--rsync-path=%s' % rsync_path))
if rsync_opts: if rsync_opts:
if '' in rsync_opts: if '' in rsync_opts:
@ -577,7 +577,7 @@ def main():
cmd.append('--link-dest=%s' % link_path) cmd.append('--link-dest=%s' % link_path)
changed_marker = '<<CHANGED>>' changed_marker = '<<CHANGED>>'
cmd.append('--out-format=' + changed_marker + '%i %n%L') cmd.append(shlex_quote('--out-format=' + changed_marker + '%i %n%L'))
# expand the paths # expand the paths
if '@' not in source: if '@' not in source:
@ -601,10 +601,10 @@ def main():
raise raise
(rc, out, err) = module.run_command( (rc, out, err) = module.run_command(
cmd, pass_fds=_sshpass_pipe, cmdstr, pass_fds=_sshpass_pipe,
before_communicate_callback=_write_password_to_pipe) before_communicate_callback=_write_password_to_pipe)
else: else:
(rc, out, err) = module.run_command(cmd) (rc, out, err) = module.run_command(cmdstr)
if rc: if rc:
return module.fail_json(msg=err, rc=rc, cmd=cmdstr) return module.fail_json(msg=err, rc=rc, cmd=cmdstr)