commit 882ca5c36f1db3e213dbcd5983d30ebf2c928e6b Author: Radek Pazdera rpazdera@redhat.com Date: Thu Jun 21 12:15:42 2012 +0200

SshUtils: Adding quotes to scp paths

There was a problem with scp commands that occured when a path containing a space was passed to any scp functions. This commit fixes that by enclosing paths within scp commands in single qoutes (').

Signed-off-by: Radek Pazdera rpazdera@redhat.com

Common/SshUtils.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) --- diff --git a/Common/SshUtils.py b/Common/SshUtils.py index e306976..340f119 100644 --- a/Common/SshUtils.py +++ b/Common/SshUtils.py @@ -362,7 +362,7 @@ def scp_to_remote(host, port, username, password, local_path, remote_path, @raise: Whatever remote_scp() raises """ command = ("scp -v -o UserKnownHostsFile=/dev/null " - " -r -P %s %s %s@%s:%s" % #-o PreferredAuthentications=password + " -r -P %s '%s' '%s@%s:%s'" % #-o PreferredAuthentications=password (port, local_path, username, host, remote_path)) password_list = [] password_list.append(password) @@ -386,7 +386,7 @@ def scp_from_remote(host, port, username, password, remote_path, local_path, @raise: Whatever remote_scp() raises """ command = ("scp -v -o UserKnownHostsFile=/dev/null " - "-o PreferredAuthentications=password -r -P %s %s@%s:%s %s" % + "-o PreferredAuthentications=password -r -P %s '%s@%s:%s' '%s'" % (port, username, host, remote_path, local_path)) password_list = [] password_list.append(password) @@ -411,7 +411,7 @@ def scp_between_remotes(src, dst, port, s_passwd, d_passwd, s_name, d_name, @return: True on success and False on failure. """ command = ("scp -v -o UserKnownHostsFile=/dev/null -o " - "PreferredAuthentications=password -r -P %s %s@%s:%s %s@%s:%s" % + "PreferredAuthentications=password -r -P %s '%s@%s:%s' '%s@%s:%s'" % (port, s_name, src, s_path, d_name, dst, d_path)) password_list = [] password_list.append(s_passwd)