diff options
| author | Brian Coca <brian.coca+git@gmail.com> | 2015-10-19 10:27:52 -0400 |
|---|---|---|
| committer | Brian Coca <brian.coca+git@gmail.com> | 2015-10-19 10:29:35 -0400 |
| commit | 133ef8c87c0950f3d83e1494e04b1eafb0c542b0 (patch) | |
| tree | 725f3f473eaa8c12ec96e1fad05dcb21c053cab6 | |
| parent | f7d1689210494374d8544c952a0b3e4194a90af0 (diff) | |
| download | ansible-modules-core-133ef8c87c0950f3d83e1494e04b1eafb0c542b0.tar.gz | |
made output match multiline, as per posted code from @n0trax
fixes #2081
| -rw-r--r-- | web_infrastructure/apache2_module.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/web_infrastructure/apache2_module.py b/web_infrastructure/apache2_module.py index 3d135fe3..04bea121 100644 --- a/web_infrastructure/apache2_module.py +++ b/web_infrastructure/apache2_module.py @@ -55,7 +55,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)) @@ -70,7 +70,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)) |