cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #2891 from ansible/synchronize-better-error-missing-rsync

Browse source 
Better error message when rsync nad ssh aren't present where synchronize is run
This commit is contained in:
Toshio Kuratomi 2016-01-26 11:36:29 -08:00
commit c8d5fdaf27
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
files/synchronize.py
View file

@ -325,6 +325,11 @@ def main():
ssh_args = module.params['ssh_args'] ssh_args = module.params['ssh_args']
verify_host = module.params['verify_host'] verify_host = module.params['verify_host']
if '/' not in rsync:
rsync = module.get_bin_path(rsync, required=True)
ssh = module.get_bin_path('ssh', required=True)
cmd = '%s --delay-updates -F' % rsync cmd = '%s --delay-updates -F' % rsync
if compress: if compress:
cmd = cmd + ' --compress' cmd = cmd + ' --compress'
@ -385,9 +390,9 @@ def main():
ssh_opts = '%s %s' % (ssh_opts, ssh_args) ssh_opts = '%s %s' % (ssh_opts, ssh_args)
if dest_port != 22: if dest_port != 22:
cmd += " --rsh 'ssh %s %s -o Port=%s'" % (private_key, ssh_opts, dest_port) cmd += " --rsh '%s %s %s -o Port=%s'" % (ssh, private_key, ssh_opts, dest_port)
else: else:
cmd += " --rsh 'ssh %s %s'" % (private_key, ssh_opts) # need ssh param cmd += " --rsh '%s %s %s'" % (ssh, private_key, ssh_opts) # need ssh param
if rsync_path: if rsync_path:
cmd = cmd + " --rsync-path=%s" % (rsync_path) cmd = cmd + " --rsync-path=%s" % (rsync_path)