valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix possible oversight in nodegroup modifications

Browse Source 
b3e2f38 enhanced nodegroup matching to allow sequences. However, the
list of regex special characters appears to have been improperly
formatted.
This commit is contained in:
Erik Johnson 2019-01-15 13:17:26 -06:00
parent 9d4321ddac
commit 9951b8dcf1
No known key found for this signature in database
GPG Key ID: 5E5583C437808F3F
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
salt/utils/minions.py
View File

@ -149,7 +149,7 @@ def nodegroup_comp(nodegroup, nodegroups, skip=None, first_call=True):
# No compound operators found in nodegroup definition. Check for # No compound operators found in nodegroup definition. Check for
# group type specifiers # group type specifiers
group_type_re = re.compile('^[A-Z]@') group_type_re = re.compile('^[A-Z]@')
regex_chars = ['(', '[', '{', '\\', '?''}])'] regex_chars = ['(', '[', '{', '\\', '?', '}', ']', ')']
if not [x for x in ret if '*' in x or group_type_re.match(x)]: if not [x for x in ret if '*' in x or group_type_re.match(x)]:
# No group type specifiers and no wildcards. # No group type specifiers and no wildcards.
# Treat this as an expression. # Treat this as an expression.