Skip to content

Commit

Permalink
Merge pull request #23956 from rallytime/bp-23906
Browse files Browse the repository at this point in the history
Backport #23906 to 2015.5
  • Loading branch information
jfindlay committed May 20, 2015
2 parents da3f919 + 9d87fd3 commit ebff1ff
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion salt/loader.py
Original file line number Diff line number Diff line change
Expand Up @@ -1065,7 +1065,12 @@ def _load_module(self, name):
self._apply_outputter(func, mod)

# enforce depends
Depends.enforce_dependencies(self._dict, self.tag)
try:
Depends.enforce_dependencies(self._dict, self.tag)
except RuntimeError as e:
log.info('Depends.enforce_dependencies() failed '
'for reasons: {0}'.format(e))

self.loaded_modules[module_name] = mod_dict
return True

Expand Down

0 comments on commit ebff1ff

Please sign in to comment.