saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Splat the list into os.path.join

Browse source
This commit is contained in:
Mike Place 2016-08-12 19:08:43 +09:00
parent fc0d5878bc
commit 09efde7634
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
salt/master.py
View file

@ -1063,7 +1063,7 @@ class AESFuncs(object):
return False
if not isinstance(load['path'], list):
return False
if not self.opts['file_recv'] or os.path.isabs(load['path']):
if not self.opts['file_recv']:
return False
if not salt.utils.verify.valid_id(self.opts, load['id']):
return False
@ -1102,7 +1102,7 @@ class AESFuncs(object):
# Path normalization should have been done by the sending
# minion but we can't guarantee it. Re-do it here.
normpath = os.path.normpath(os.path.join(load['path']))
normpath = os.path.normpath(os.path.join(*load['path']))
# Ensure that this safety check is done after the path
# have been normalized.