openstack/fuel-library
Code Issues Proposed changes

Fix update_modules.sh to handle missing timeout cmd

Browse Source 
This change fixes the update_modules.sh scrip so that if the 'timeout'
command is not available it will no longer error.  Previously if the
system did not have a 'timeout' command, the update_modules.sh script
would fail silently and return 1.

Change-Id: I7b469b65a30bfe2af8acf62bebabf10c9af1e374
Closes-Bug: #1510665
This commit is contained in:
Alex Schultz 2015-10-27 14:03:08 -05:00
parent 8b72e8bd7d
commit 99c054c732
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
deployment/update_modules.sh
View File

@ -123,7 +123,8 @@ if [ "$USE_BUNDLER" = true ]; then
bundle update bundle update
fi fi
TIMEOUT_CMD=`which timeout` # if no timeout command, return true so we don't fail this script (LP#1510665)
TIMEOUT_CMD=`which timeout || true`
if [ -n "$TIMEOUT_CMD" ]; then if [ -n "$TIMEOUT_CMD" ]; then
TIMEOUT_CMD="$TIMEOUT_CMD $TIMEOUT" TIMEOUT_CMD="$TIMEOUT_CMD $TIMEOUT"
fi fi