diff -r 65614732cfe7 -r f1257533021a scripts/functions
--- a/scripts/functions	Sat Jul 26 15:14:48 2008 +0000
+++ b/scripts/functions	Sat Jul 26 15:16:40 2008 +0000
@@ -5,6 +5,8 @@
 # Prepare the fault handler
 CT_OnError() {
     ret=$?
+    # Bail out early in subshell, the upper level shell will act accordingly.
+    [ ${BASH_SUBSHELL} -eq 0 ] || exit $ret
     CT_DoLog ERROR "Build failed in step '${CT_STEP_MESSAGE[${CT_STEP_COUNT}]}'"
     for((step=(CT_STEP_COUNT-1); step>1; step--)); do
         CT_DoLog ERROR "      called in step '${CT_STEP_MESSAGE[${step}]}'"