From ce28176fa22bafb2cdbee485d4cff03b8b91f377 Mon Sep 17 00:00:00 2001 From: Casey Fitzpatrick Date: Tue, 24 Jun 2014 20:37:37 -0400 Subject: [PATCH] apache2_module handles multiple lines of output, fixes #7736 and #7857 Conflicts: library/web_infrastructure/apache2_module --- library/web_infrastructure/apache2_module | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/library/web_infrastructure/apache2_module b/library/web_infrastructure/apache2_module index 29e170ea236..cc8da4ac91a 100644 --- a/library/web_infrastructure/apache2_module +++ b/library/web_infrastructure/apache2_module @@ -51,7 +51,7 @@ def _disable_module(module): a2dismod_binary = module.get_bin_path("a2dismod") result, stdout, stderr = module.run_command("%s %s" % (a2dismod_binary, name)) - if re.match(r'.*already disabled.*', stdout): + if re.match(r'.*' + 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)) @@ -63,7 +63,7 @@ def _enable_module(module): a2enmod_binary = module.get_bin_path("a2enmod") result, stdout, stderr = module.run_command("%s %s" % (a2enmod_binary, name)) - if re.search(r'.*%s\s+already enabled.*' % name, stdout, re.M): + if re.match(r'.*' + 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))