We can only concatenate lists, not list + tuple

This commit is contained in:
Pedro Algarvio 2014-05-14 11:01:32 +01:00
parent 54a21b14b5
commit 517b0a096e

View File

@ -603,7 +603,10 @@ def build_ssh_command(options, *arguments, **parameters):
return cmd + list(arguments)
def build_scp_command(options, *parameters):
def build_scp_command(options, *arguments):
'''
Build the SCP command with the required options
'''
return [
'scp',
'-i',
@ -614,7 +617,7 @@ def build_scp_command(options, *parameters):
'-oUserKnownHostsFile=/dev/null',
# Don't re-use the SSH connection. Less failures.
'-oControlPath=none',
] + parameters
] + list(arguments)
def main():