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

Exit immediately on configuration error

Browse source
This commit is contained in:
Bo Maryniuk 2016-07-12 17:15:38 +02:00
parent 43d965907c
commit a84556e596
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
salt/config.py
View file

@ -1605,8 +1605,10 @@ def include_config(include, orig_path, verbose):
for fn_ in sorted(glob.glob(path)):
log.debug('Including configuration from {0!r}'.format(fn_))
opts = _read_conf_file(fn_)
try:
opts = _read_conf_file(fn_)
except salt.exceptions.SaltConfigurationError as error:
sys.exit(1)
include = opts.get('include', [])
if include:
opts.update(include_config(include, fn_, verbose))