ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-04-24 19:31:26 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Fix command building for scp if ssh

Browse source
This commit is contained in:
Matt Martz 2015-06-02 13:30:14 -05:00
parent 620fad9f8d
commit 71014ab01e
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
lib/ansible/plugins/connections/ssh.py
View file

@ -407,12 +407,12 @@ class Connection(ConnectionBase):
if C.DEFAULT_SCP_IF_SSH: if C.DEFAULT_SCP_IF_SSH:
cmd.append('scp') cmd.append('scp')
cmd += self._common_args cmd.extend(self._common_args)
cmd.append(in_path,host + ":" + pipes.quote(out_path)) cmd.extend([in_path, '{0}:{1}'.format(host, pipes.quote(out_path))])
indata = None indata = None
else: else:
cmd.append('sftp') cmd.append('sftp')
cmd += self._common_args cmd.extend(self._common_args)
cmd.append(host) cmd.append(host)
indata = "put {0} {1}\n".format(pipes.quote(in_path), pipes.quote(out_path)) indata = "put {0} {1}\n".format(pipes.quote(in_path), pipes.quote(out_path))
@ -440,12 +440,12 @@ class Connection(ConnectionBase):
if C.DEFAULT_SCP_IF_SSH: if C.DEFAULT_SCP_IF_SSH:
cmd.append('scp') cmd.append('scp')
cmd += self._common_args cmd.extend(self._common_args)
cmd += ('{0}:{1}'.format(host, in_path), out_path) cmd.extend(['{0}:{1}'.format(host, in_path), out_path])
indata = None indata = None
else: else:
cmd.append('sftp') cmd.append('sftp')
cmd += self._common_args cmd.extend(self._common_args)
cmd.append(host) cmd.append(host)
indata = "get {0} {1}\n".format(in_path, out_path) indata = "get {0} {1}\n".format(in_path, out_path)