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

Remove deprecation: BaseException.message deprecated as of 2.6

Browse source
This commit is contained in:
Bo Maryniuk 2016-07-13 11:44:33 +02:00
parent 0e65cfec91
commit 8699194647
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
salt/config.py
View file

@ -1567,7 +1567,7 @@ def load_config(path, env_var, default_path=None):
opts['conf_file'] = path
return opts
except salt.exceptions.SaltConfigurationError as error:
log.error(error.message)
log.error(error)
sys.exit(salt.defaults.exitcodes.EX_GENERIC)
log.debug('Missing configuration file: {0}'.format(path))
@ -1613,6 +1613,7 @@ def include_config(include, orig_path, verbose):
try:
opts = _read_conf_file(fn_)
except salt.exceptions.SaltConfigurationError as error:
log.error(error)
sys.exit(salt.defaults.exitcodes.EX_GENERIC)
include = opts.get('include', [])
if include: