saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #23730 from rallytime/bp-23729

Browse source 
Backport #23729 to 2014.7
This commit is contained in:
Thomas S Hatch 2015-05-14 15:58:34 -06:00
commit 2610195262
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
salt/modules/grains.py
View file

@ -159,11 +159,18 @@ def item(*args, **kwargs):
salt '*' grains.item host sanitize=True
'''
ret = {}
for arg in args:
try:
ret[arg] = __grains__[arg]
except KeyError:
pass
default = kwargs.get('default', '')
delimiter = kwargs.get('delimiter', ':')
try:
for arg in args:
ret[arg] = salt.utils.traverse_dict_and_list(__grains__,
arg,
default,
delimiter)
except KeyError:
pass
if salt.utils.is_true(kwargs.get('sanitize')):
for arg, func in _SANITIZERS.items():
if arg in ret: