commit 0ed4af02da0bd4a0f757dd8c2156913e6c7a724c
author Jenkins <jenkins@review.openstack.org> Thu Feb 27 14:57:43 2014 +0000
committer Gerrit Code Review <review@openstack.org> Thu Feb 27 14:57:43 2014 +0000
tree 4056ee5ee2cec8d7bc1f6ba03832421792f18403
parent 003a6a3e1032d882aeff250d3098d48e1315ef1f
parent 09bd7c8fd5a662ef697eb61638efbe862a4875a6

Merge "enable -o errexit"

functions-common

diff --git a/functions-common b/functions-common
index 8e6b2b1..2248fbb 100644
--- a/functions-common
+++ b/functions-common
@@ -1125,7 +1125,8 @@
     fi
 
     # 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
         service=`basename $service`

stack.sh

diff --git a/stack.sh b/stack.sh
index 4333fb2..ac89e52 100755
--- a/stack.sh
+++ b/stack.sh
@@ -605,6 +605,9 @@
     exit $r
 }
 
+
+set -o errexit
+
 # 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.
 set -o xtrace