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

remove (?x) modifiers

Browse Source 
at the start of the regex there can be modifiers which also have to be removed, see #39188
This commit is contained in:
Mrten 2017-02-07 11:55:51 +01:00 committed by GitHub
parent 9d8e72b881
commit 66a25796a4
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
salt/states/file.py
View File

@ -4107,7 +4107,9 @@ def comment(name, regex, char='#', backup='.bak'):
if not check_res: if not check_res:
return _error(ret, check_msg) return _error(ret, check_msg)
unanchor_regex = regex.lstrip('^').rstrip('$') # remove (?i)-like flags, ^ and $
unanchor_regex = re.sub(r'^(\(\?[iLmsux]\))?\^?(.*?)\$?$', r'\2', regex)
comment_regex = char + unanchor_regex comment_regex = char + unanchor_regex
# Check if the line is already commented # Check if the line is already commented