valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #23385 from rallytime/bp-23346

Browse Source 
Backport #23346 to 2014.7
This commit is contained in:
Justin Findlay 2015-05-06 14:12:29 -06:00
commit 1b13ec04c2
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
salt/utils/cloud.py
View File

@ -1032,7 +1032,14 @@ def deploy_script(host,
)
file_map_fail.append({local_file: remote_file})
continue
remote_dir = os.path.dirname(remote_file)
if os.path.isdir(local_file):
dir_name = os.path.basename(local_file)
remote_dir = os.path.join(os.path.dirname(remote_file),
dir_name)
else:
remote_dir = os.path.dirname(remote_file)
if remote_dir not in remote_dirs:
root_cmd('mkdir -p \'{0}\''.format(remote_dir), tty, sudo, **kwargs)
remote_dirs.append(remote_dir)
@ -1526,6 +1533,8 @@ def sftp_file(dest_path, contents=None, kwargs=None, local_file=None):
'''
Use sftp to upload a file to a server
'''
put_args = []
if kwargs is None:
kwargs = {}
@ -1536,6 +1545,8 @@ def sftp_file(dest_path, contents=None, kwargs=None, local_file=None):
if local_file is not None:
tmppath = local_file
if os.path.isdir(local_file):
put_args = ['-r']
log.debug('Uploading {0} to {1} (sfcp)'.format(dest_path, kwargs.get('hostname')))
@ -1594,8 +1605,8 @@ def sftp_file(dest_path, contents=None, kwargs=None, local_file=None):
)
)
cmd = 'echo "put {0} {1}" | sftp {2} {3[username]}@{3[hostname]}'.format(
tmppath, dest_path, ' '.join(ssh_args), kwargs
cmd = 'echo "put {0} {1} {2}" | sftp {3} {4[username]}@{4[hostname]}'.format(
' '.join(put_args), tmppath, dest_path, ' '.join(ssh_args), kwargs
)
log.debug('SFTP command: {0!r}'.format(cmd))
retcode = _exec_ssh_cmd(cmd,