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

Fix line, use os.sep instead of os.linesep

Browse source
This commit is contained in:
twangboy 2017-08-24 15:39:30 -06:00
parent d5f27901e3
commit e20aa5c39b
No known key found for this signature in database
GPG key ID: 93FF3BDEB278C9EB
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
salt/modules/file.py
View file

@ -3586,7 +3586,6 @@ def source_list(source, source_hash, saltenv):
if contextkey in __context__:
return __context__[contextkey]
# get the master file list
if isinstance(source, list):
mfiles = [(f, saltenv) for f in __salt__['cp.list_master'](saltenv)]
@ -3638,7 +3637,7 @@ def source_list(source, source_hash, saltenv):
urlparsed_single_src.path))):
ret = (single_src, single_hash)
break
elif single_src.startswith(os.linesep) and os.path.exists(single_src):
elif single_src.startswith(os.sep) and os.path.exists(single_src):
ret = (single_src, single_hash)
break
elif isinstance(single, six.string_types):
@ -3668,7 +3667,7 @@ def source_list(source, source_hash, saltenv):
elif proto.startswith('http') or proto == 'ftp':
ret = (single, source_hash)
break
elif single.startswith(os.linesep) and os.path.exists(single):
elif single.startswith(os.sep) and os.path.exists(single):
ret = (single, source_hash)
break
if ret is None: