Merge pull request #117 from direvus/apache2-module-word-boundary

Add word boundary in apache2_module regexp
reviewable/pr18780/r1
Brian Coca 10 years ago
commit 44ffe73e02

@ -54,7 +54,7 @@ def _disable_module(module):
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")
elif result != 0:
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))
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")
elif result != 0:
module.fail_json(msg="Failed to enable module %s: %s" % (name, stdout))

Loading…
Cancel
Save