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

Merge pull request #7170 from hulu/filename-instead-of-file

Browse Source 
ssh: rename file => filename, to not shadow the built-in
This commit is contained in:
Joseph Hall 2013-09-11 05:38:00 -07:00
commit d2f1215971
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
salt/client/ssh/__init__.py
View File

@ -616,11 +616,11 @@ def prep_trans_tar(opts, chunks, file_refs):
break
files = file_client.cache_dir(name, env, True)
if files:
for file in files:
for filename in files:
tgt = os.path.join(
env_root,
short,
file[file.find(short) + len(short):],
filename[filename.find(short) + len(short):],
)
tgt_dir = os.path.dirname(tgt)
if not os.path.isdir(tgt_dir):

4
salt/client/ssh/state.py
View File

@ -128,11 +128,11 @@ def prep_trans_tar(opts, chunks, file_refs):
break
files = file_client.cache_dir(name, env, True)
if files:
for file in files:
for filename in files:
tgt = os.path.join(
env_root,
short,
file[file.find(short) + len(short):],
filename[filename.find(short) + len(short):],
)
tgt_dir = os.path.dirname(tgt)
if not os.path.isdir(tgt_dir):