mirror of
https://github.com/ansible-collections/ansible.posix.git
synced 2026-01-11 15:15:26 +01:00
Merge pull request #213 from ndgit/fix-24-and-190
synchronize: quotes around arguments fix quoting for specific cmd arguments Fixes: #24 #190 ISSUE TYPE: Bugfix Pull Request COMPONENT NAME: module: synchronize Reviewed-by: Abhijeet Kasurde <None> Reviewed-by: Robert Rettig <None> Reviewed-by: Hideki Saito <saito@fgrep.org> Reviewed-by: Mike Graves <mgraves@redhat.com>
This commit is contained in:
commit
f2601b01da
3 changed files with 9 additions and 6 deletions
4
changelogs/fragments/213_quote_cmd_args.yml
Normal file
4
changelogs/fragments/213_quote_cmd_args.yml
Normal file
|
|
@ -0,0 +1,4 @@
|
||||||
|
---
|
||||||
|
bugfixes:
|
||||||
|
- Synchronize module not recognizing remote ssh key (https://github.com/ansible-collections/ansible.posix/issues/24).
|
||||||
|
- Synchronize not using quotes around arguments like --out-format (https://github.com/ansible-collections/ansible.posix/issues/190).
|
||||||
|
|
@ -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)
|
||||||
|
|
|
||||||
|
|
@ -1,2 +1 @@
|
||||||
shippable/posix/group1
|
shippable/posix/group1
|
||||||
disabled # fixme package
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue