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

Merge pull request #10250 from cachedout/#9991

Browse Source 
Match against lists in nested dicts in grains
This commit is contained in:
Thomas S Hatch 2014-02-07 21:24:45 -07:00
commit a407bb5cdc
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
salt/utils/__init__.py
View File

@ -1099,6 +1099,11 @@ def subdict_match(data, expr, delim=':', regex_match=False):
if isinstance(match, list): if isinstance(match, list):
# We are matching a single component to a single list member # We are matching a single component to a single list member
for member in match: for member in match:
if isinstance(member, dict):
if matchstr.startswith('*:'):
matchstr = matchstr[2:]
if subdict_match(member, matchstr, regex_match=regex_match):
return True
if _match(member, matchstr, regex_match=regex_match): if _match(member, matchstr, regex_match=regex_match):
return True return True
continue continue