diff -r 6eb39aec2d07 -r 3e590fb8f1a6 scripts/functions
--- a/scripts/functions	Mon Jul 14 15:20:11 2008 +0000
+++ b/scripts/functions	Mon Jul 14 15:22:53 2008 +0000
@@ -3,8 +3,11 @@
 # Licensed under the GPL v2. See COPYING in the root of this package
 
 # Prepare the fault handler
+CT_IN_FAULT_HANDLER=0
 CT_OnError() {
     ret=$?
+    [ ${CT_IN_FAULT_HANDLER} -ne 0 ] && return 0
+    CT_IN_FAULT_HANDLER=1
     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}]}'"