cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Add word boundary in apache2_module regexp

Browse source 
Add a word boundary \b to the regexp for checking the output of a2{en,dis}mod,
to avoid a false positive for a module that ends with the same text as the
module we're working on.

For example, the previous regexp r'.*spam already enabled' would also match
against 'eggs_spam already enabled'.

Also, get rid of the redundant '.*' from the end of the regexp.
This commit is contained in:
Brendan Jurd 2014-10-02 16:32:30 +10:00 committed by Matt Clay
parent 15fcbcb0ee
commit fdc52b8277
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/ansible/modules/web_infrastructure/apache2_module.py
View file

@ -54,7 +54,7 @@ def _disable_module(module):
result, stdout, stderr = module.run_command("%s %s" % (a2dismod_binary, name)) result, stdout, stderr = module.run_command("%s %s" % (a2dismod_binary, name))
if re.match(r'.*' + name + r' already disabled.*', stdout, re.S): if re.match(r'.*\b' + name + r' already disabled', stdout, re.S):
module.exit_json(changed = False, result = "Success") module.exit_json(changed = False, result = "Success")
elif result != 0: elif result != 0:
module.fail_json(msg="Failed to disable module %s: %s" % (name, stdout)) module.fail_json(msg="Failed to disable module %s: %s" % (name, stdout))
@ -69,7 +69,7 @@ def _enable_module(module):
result, stdout, stderr = module.run_command("%s %s" % (a2enmod_binary, name)) result, stdout, stderr = module.run_command("%s %s" % (a2enmod_binary, name))
if re.match(r'.*' + name + r' already enabled.*', stdout, re.S): if re.match(r'.*\b' + name + r' already enabled', stdout, re.S):
module.exit_json(changed = False, result = "Success") module.exit_json(changed = False, result = "Success")
elif result != 0: elif result != 0:
module.fail_json(msg="Failed to enable module %s: %s" % (name, stdout)) module.fail_json(msg="Failed to enable module %s: %s" % (name, stdout))