From 8001eedbea1c41681b992385c9b8d596af873e90 Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Tue, 9 Oct 2012 09:45:23 -0700 Subject: [PATCH] Improve module regex. The pattern was too generous and matching multiple module lines. Change-Id: I8ba95aeb913783139f544f85586dbae73a6bfb8f Reviewed-on: https://review.openstack.org/14234 Reviewed-by: Clark Boylan Approved: James E. Blair Tested-by: Jenkins --- install_modules.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install_modules.sh b/install_modules.sh index c6860a10b4..0848c4917f 100755 --- a/install_modules.sh +++ b/install_modules.sh @@ -59,7 +59,7 @@ fi for MOD in ${!MODULES[*]} ; do # If the module at the current version does not exist upgrade or install it. - if ! echo $MODULE_LIST | grep "$MOD.*${MODULES[$MOD]}" >/dev/null 2>&1 + if ! echo $MODULE_LIST | grep "$MOD ([^v]*v${MODULES[$MOD]}" >/dev/null 2>&1 then # Attempt module upgrade. If that fails try installing the module. if ! puppet module upgrade $MOD --version ${MODULES[$MOD]} >/dev/null 2>&1