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 #22863 from rallytime/bp-20974

Browse source 
Backport #20974 to 2014.7
This commit is contained in:
Justin Findlay 2015-04-20 13:29:37 -06:00
commit 2973eb18bc
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/utils/__init__.py
View file

@ -1153,7 +1153,7 @@ def check_whitelist_blacklist(value, whitelist=None, blacklist=None):
if whitelist:
try:
for expr in whitelist:
if expr_match(expr, value):
if expr_match(value, expr):
in_whitelist = True
break
except TypeError:
@ -1165,7 +1165,7 @@ def check_whitelist_blacklist(value, whitelist=None, blacklist=None):
if blacklist:
try:
for expr in blacklist:
if expr_match(expr, value):
if expr_match(value, expr):
in_blacklist = True
break
except TypeError: