a-c-m
/
community.general
mirror of https://github.com/ansible-collections/community.general.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11129 from sivel/fix-scp-if-ssh 

Fix command building for scp if ssh
pull/4420/head
James Cammarata 2015-06-02 14:02:51 -05:00
parent 300eb3a843 71014ab01e
commit c4ae51089d
1 changed files with 6 additions and 6 deletions
Show Stats 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)