From b520c7f9c455f830abf91067f448e997275d4bf4 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN\"" <yann.morin.1998@anciens.enib.fr>
Date: Sat, 26 Jul 2008 15:16:40 +0000
Subject: Backport #864 from trunk:   Limit printing the error message only in
 the top-level shell.

 /branches/1.2/scripts/functions |    2     2     0     0 ++
 1 file changed, 2 insertions(+)

diff --git a/scripts/functions b/scripts/functions
index c37a0c7..cc2f300 100644
--- a/scripts/functions
+++ b/scripts/functions
@@ -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}]}'"
-- 
cgit v0.10.2-6-g49f6