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

Fix loader condition

Browse Source
This commit is contained in:
Mike Place 2014-06-05 13:57:00 -06:00
parent b8d0842fe1
commit e91c23d494
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
salt/loader.py
View File

@ -778,8 +778,9 @@ class Loader(object):
for mod in self.modules:
if not hasattr(mod, '__salt__'):
mod.__salt__ = funcs
elif not in_pack(pack, '__salt__') and \
str(mod.__name__).startswith('salt.loaded.int.grain'):
elif hasattr(mod, '__salt__') or (not in_pack(pack, '__salt__') and \
str(mod.__name__).startswith('salt.loaded.int.grain')
):
mod.__salt__.update(funcs)
else:
mod.__salt__ = funcs