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

load checking

Browse Source 
want to rebuild
fixes #19264

load checking

want to rebuild
This commit is contained in:
James Michael DuPont 2015-01-03 08:35:06 -06:00
parent e2dd4b9958
commit 5d72c52838
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
salt/loader.py
View File

@ -991,25 +991,25 @@ class Loader(object):
reload(submodule)
except AttributeError:
continue
except ImportError:
except ImportError as error:
if failhard:
log.debug(
'Failed to import {0} {1}, this is most likely NOT a '
'problem:\n'.format(
self.tag, name
'problem, but the exception was {2}\n'.format(
self.tag, name, error
),
exc_info=True
)
if not failhard:
log.debug('Failed to import {0} {1}. Another attempt will be made to try to resolve dependencies.'.format(
self.tag, name))
log.debug('Failed to import {0} {1}. The exeception was {2}. Another attempt will be made to try to resolve dependencies.'.format(
self.tag, name, error))
failed_loads[name] = path
continue
except Exception:
except Exception as error:
log.warning(
'Failed to import {0} {1}, this is due most likely to a '
'syntax error. Traceback raised:\n'.format(
self.tag, name
'syntax error. The exception is {2}. Traceback raised:\n'.format(
self.tag, name, error
),
exc_info=True
)