openstack/devstack
Code Issues Proposed changes

Merge "enable -o errexit"

Browse Source
This commit is contained in:
Jenkins
2014-02-27 14:57:43 +00:00
committed by Gerrit Code Review
parent 003a6a3e10 09bd7c8fd5
commit 0ed4af02da
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
functions-common
View File

@@ -1125,7 +1125,8 @@ function service_check() {
fi fi
# Check if there is any falure flag file under $SERVICE_DIR/$SCREEN_NAME # Check if there is any falure flag file under $SERVICE_DIR/$SCREEN_NAME
failures=`ls "$SERVICE_DIR/$SCREEN_NAME"/*.failure 2>/dev/null` # make this -o errexit safe
failures=`ls "$SERVICE_DIR/$SCREEN_NAME"/*.failure 2>/dev/null || /bin/true`
for service in $failures; do for service in $failures; do
service=`basename $service` service=`basename $service`

3
stack.sh
View File

@@ -605,6 +605,9 @@ function err_trap {
exit $r exit $r
} }
set -o errexit
# Print the commands being run so that we can see the command that triggers # Print the commands being run so that we can see the command that triggers
# an error. It is also useful for following along as the install occurs. # an error. It is also useful for following along as the install occurs.
set -o xtrace set -o xtrace