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

This time I banged my head on the table extra-hard.

Browse Source
This commit is contained in:
Mike Place 2014-06-05 15:31:08 -06:00
parent 9589ebf254
commit c1cd9c1934
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
salt/loader.py
View File

@ -781,8 +781,8 @@ class Loader(object):
not str(mod.__name__).startswith('salt.loaded.int.grain')
):
mod.__salt__ = funcs
elif hasattr(mod, '__salt__') and (not in_pack(pack, '__salt__') and \
str(mod.__name__).startswith('salt.loaded.int.grain')
elif hasattr(mod, '__salt__') and (not in_pack(pack, '__salt__' and \
str(mod.__name__).startswith('salt.loaded.int.grain'))
):
mod.__salt__.update(funcs)
return funcs