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

Force file_roots environments to be strings

Browse source
This commit is contained in:
Erik Johnson 2015-11-17 14:06:30 -06:00
parent b2690140c7
commit ec64ec85d6
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
salt/config.py
View file

@ -1275,9 +1275,14 @@ def _validate_file_roots(opts):
' using defaults')
return {'base': _expand_glob_path([salt.syspaths.BASE_FILE_ROOTS_DIR])}
for saltenv, dirs in six.iteritems(opts['file_roots']):
normalized_saltenv = six.text_type(saltenv)
if normalized_saltenv != saltenv:
opts['file_roots'][normalized_saltenv] = \
opts['file_roots'].pop(saltenv)
if not isinstance(dirs, (list, tuple)):
opts['file_roots'][saltenv] = []
opts['file_roots'][saltenv] = _expand_glob_path(opts['file_roots'][saltenv])
opts['file_roots'][normalized_saltenv] = []
opts['file_roots'][normalized_saltenv] = \
_expand_glob_path(opts['file_roots'][normalized_saltenv])
return opts['file_roots']