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

_regex_to_static refactored to work on lists

Browse source
This commit is contained in:
JerzyX Drozdz 2018-03-01 10:44:37 +01:00 • committed by rallytime
parent 464eef6fe1
commit de668166f9
No known key found for this signature in database
GPG key ID: E8F1A4B90D0DEA19
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
salt/modules/file.py
View file

@ -1718,11 +1718,12 @@ def _regex_to_static(src, regex):
return None
try:
src = re.search(regex, src, re.M)
compiled = re.compile(regex, re.DOTALL)
src = [res.group() for res in map(compiled.search, src) if res]
except Exception as ex:
raise CommandExecutionError("{0}: '{1}'".format(_get_error_message(ex), regex))
return src and src.group().rstrip('\r') or regex
return src and src[0] or regex
def _assert_occurrence(src, probe, target, amount=1):