Merge pull request #18807 from hulu/develop

fix for #18778 (salt-ssh tries to copy file to the filesystem root)
This commit is contained in:
Thomas S Hatch 2014-12-09 14:37:28 -07:00
commit 1e9a9aa2fc

View File

@ -161,7 +161,7 @@ def prep_trans_tar(file_client, chunks, file_refs, pillar=None):
for filename in files:
fn = filename[filename.find(short) + len(short):]
if fn.startswith('/'):
fn.strip('/')
fn = fn.strip('/')
tgt = os.path.join(
env_root,
short,