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

pylint fixes

Browse Source
This commit is contained in:
Thomas S Hatch 2013-11-07 11:02:53 -07:00
parent 4f00fa256b
commit 5baef7b3e3
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
salt/modules/grains.py
View File

@ -361,7 +361,12 @@ def filter_by(lookup_dict, grain='os_family', merge=None, default='default'):
# this one will render {D: {E: I, G: H}, J: K}
salt '*' grains.filter_by '{A: B, C: {D: {E: F,G: H}}}' 'xxx' '{D: {E: I},J: K}' 'C'
'''
ret = lookup_dict.get( __grains__.get(grain, default), lookup_dict.get(default,None) )
ret = lookup_dict.get(
__grains__.get(
grain, default),
lookup_dict.get(
default, None)
)
if merge: