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

Conditionally inject context (if no one else has)

Browse Source
This commit is contained in:
Thomas Jackson 2015-02-03 20:04:38 -08:00
parent 686ec05b84
commit 95dd62f24d
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
salt/loader.py
View File

@ -1068,14 +1068,17 @@ class LazyLoader(salt.utils.lazy.LazyDict):
funcname = getattr(mod, '__func_alias__', {}).get(attr, attr)
funcs['{0}.{1}'.format(module_name, funcname)] = func
self._apply_outputter(func, mod)
# TODO: verify context??
try:
context = sys.modules[
self._dict[next(self._dict.iterkeys())].__module__
].__context__
except (AttributeError, StopIteration):
context = {}
mod.__context__ = context
# TODO: global context to actually share? Right now a few people pass
# it in "pack" which seems bad...
# if you don't have context, try to find someone who does
if not hasattr(mod, '__context__'):
try:
context = sys.modules[
self._dict[next(self._dict.iterkeys())].__module__
].__context__
except (AttributeError, StopIteration):
context = {}
mod.__context__ = context
self._dict.update(funcs)
# enforce depends