From a586208ab4cdfcec9e18ef8bf14f81cefe9205f9 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN\"" <yann.morin.1998@anciens.enib.fr>
Date: Sat, 26 Jul 2008 09:22:42 +0000
Subject: In case of error, the error message would be printing in subshells,
 thus printing as many error message as there were subshells. Limit printing
 this message only in the top-level shell.

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

diff --git a/scripts/functions b/scripts/functions
index e47b286..c07c336 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