From 1452a058dfb86834dda631a737a93543ad15c1e3 Mon Sep 17 00:00:00 2001 From: Jack Neely Date: Fri, 23 May 2014 11:26:59 -0400 Subject: [PATCH] apache2_module: Handle dep resolution The apache2_module module did not properly handle when a2enmod would handle apache module dependancies. It would always return a state of changed. I've updated the regular expression to properly parse that output as well as the normal output. A good example of this is the mod_proxy_http module. --- web_infrastructure/apache2_module | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web_infrastructure/apache2_module b/web_infrastructure/apache2_module index 103a1537d88..d966fad58e5 100644 --- a/web_infrastructure/apache2_module +++ b/web_infrastructure/apache2_module @@ -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.match(r'.*already enabled.*', stdout): + if re.search(r'.*%s\s+already enabled.*' % name, stdout, re.M): module.exit_json(changed = False, result = "Success") elif result != 0: module.fail_json(msg="Failed to enable module %s: %s" % (name, stdout))