Commit 71014ab0 by Matt Martz

Fix command building for scp if ssh

parent 620fad9f
...@@ -407,12 +407,12 @@ class Connection(ConnectionBase): ...@@ -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): ...@@ -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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment