mirror of
https://github.com/ansible-collections/ansible.posix.git
synced 2026-05-06 21:32:59 +00:00
Make synchronize work with multiple src paths
This commit is contained in:
@@ -395,9 +395,9 @@ def substitute_controller(path):
|
||||
|
||||
|
||||
def is_rsh_needed(source, dest):
|
||||
if source.startswith('rsync://') or dest.startswith('rsync://'):
|
||||
if all(e.startswith('rsync://') for e in source) or dest.startswith('rsync://'):
|
||||
return False
|
||||
if ':' in source or ':' in dest:
|
||||
if any(':' in e for e in source) or ':' in dest:
|
||||
return True
|
||||
return False
|
||||
|
||||
@@ -405,7 +405,7 @@ def is_rsh_needed(source, dest):
|
||||
def main():
|
||||
module = AnsibleModule(
|
||||
argument_spec=dict(
|
||||
src=dict(type='path', required=True),
|
||||
src=dict(type='list', required=True),
|
||||
dest=dict(type='path', required=True),
|
||||
dest_port=dict(type='int'),
|
||||
delete=dict(type='bool', default=False),
|
||||
@@ -539,11 +539,10 @@ def main():
|
||||
if dirs:
|
||||
cmd.append('--dirs')
|
||||
|
||||
if source.startswith('rsync://') and dest.startswith('rsync://'):
|
||||
if all(e.startswith('rsync://') for e in source) and dest.startswith('rsync://'):
|
||||
module.fail_json(msg='either src or dest must be a localhost', rc=1)
|
||||
|
||||
if is_rsh_needed(source, dest):
|
||||
|
||||
# https://github.com/ansible/ansible/issues/15907
|
||||
has_rsh = False
|
||||
for rsync_opt in rsync_opts:
|
||||
@@ -599,7 +598,7 @@ def main():
|
||||
changed_marker = '<<CHANGED>>'
|
||||
cmd.append('--out-format=%s' % shlex_quote(changed_marker + '%i %n%L'))
|
||||
|
||||
cmd.append(shlex_quote(source))
|
||||
[cmd.append(shlex_quote(e)) for e in source]
|
||||
cmd.append(shlex_quote(dest))
|
||||
cmdstr = ' '.join(cmd)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user