From b0b4c56bd78184625dfedb9c3350085ee9ec2f25 Mon Sep 17 00:00:00 2001 From: Brian Coca Date: Mon, 19 Oct 2015 10:27:52 -0400 Subject: [PATCH] made output match multiline, as per posted code from @n0trax fixes #2081 --- web_infrastructure/apache2_module.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web_infrastructure/apache2_module.py b/web_infrastructure/apache2_module.py index cb43ba9b0eb..ecc176a20b3 100644 --- a/web_infrastructure/apache2_module.py +++ b/web_infrastructure/apache2_module.py @@ -56,7 +56,7 @@ def _disable_module(module): result, stdout, stderr = module.run_command("%s %s" % (a2dismod_binary, name)) - if re.match(r'.*\b' + name + r' already disabled', stdout, re.S): + if re.match(r'.*\b' + name + r' already disabled', stdout, re.S|re.M): module.exit_json(changed = False, result = "Success") elif result != 0: module.fail_json(msg="Failed to disable module %s: %s" % (name, stdout)) @@ -71,7 +71,7 @@ def _enable_module(module): result, stdout, stderr = module.run_command("%s %s" % (a2enmod_binary, name)) - if re.match(r'.*\b' + name + r' already enabled', stdout, re.S): + if re.match(r'.*\b' + name + r' already enabled', stdout, re.S|re.M): module.exit_json(changed = False, result = "Success") elif result != 0: module.fail_json(msg="Failed to enable module %s: %s" % (name, stdout))