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

Restore original variable name

Browse source
This commit is contained in:
Erik Johnson 2018-03-28 13:29:33 -05:00
parent ae0f112a49
commit 250039b11f
No known key found for this signature in database
GPG key ID: 5E5583C437808F3F
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
salt/utils/stringutils.py
View file

@ -292,12 +292,12 @@ def build_whitespace_split_regex(text):
return r'(?m)^{0}$'.format(regex)
def expr_match(val, expr):
def expr_match(line, expr):
'''
Checks whether or not val matches the specified expression. Tries to match
expr first as a glob using fnmatch.fnmatch(), and then tries to match expr
as a regular expression. Originally designed to match minion IDs for
whitelists/blacklists.
Checks whether or not the passed value matches the specified expression.
Tries to match expr first as a glob using fnmatch.fnmatch(), and then tries
to match expr as a regular expression. Originally designed to match minion
IDs for whitelists/blacklists.
Note that this also does exact matches, as fnmatch.fnmatch() will return
``True`` when no glob characters are used and the string is an exact match:
@ -308,15 +308,15 @@ def expr_match(val, expr):
True
'''
try:
if fnmatch.fnmatch(val, expr):
if fnmatch.fnmatch(line, expr):
return True
try:
if re.match(r'\A{0}\Z'.format(expr), val):
if re.match(r'\A{0}\Z'.format(expr), line):
return True
except re.error:
pass
except TypeError:
log.exception('Value %r or expression %r is not a string', val, expr)
log.exception('Value %r or expression %r is not a string', line, expr)
return False