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

Merge pull request #16113 from cachedout/issue_15693

Browse Source 
Error handling in broken SLS file.
This commit is contained in:
Thomas S Hatch 2014-09-24 20:11:58 -06:00
commit b043c150ab
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
salt/state.py
View File

@ -2506,7 +2506,10 @@ class BaseHighState(object):
', '.join(resolved_envs)) ', '.join(resolved_envs))
log.critical(msg) log.critical(msg)
errors.append(msg) errors.append(msg)
try:
self._handle_iorder(state) self._handle_iorder(state)
except TypeError:
log.critical('Could not render SLS {0}. Syntax error detected.'.format(sls))
else: else:
state = {} state = {}
return state, errors return state, errors