# HG changeset patch # User "Yann E. MORIN" # Date 1216072618 0 # Node ID 65e27c3bcf990635b75d68d3d3a73b3e3f90e45e # Parent 42c7282660d04093b29b50962612f8a324d2df92 Catching a double fault is doomed... Don't take action. Simplify CT_DoExecLog: it does not support affectations prior to the command, anyway. /trunk/scripts/functions | 5 1 4 0 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff -r 42c7282660d0 -r 65e27c3bcf99 scripts/functions --- a/scripts/functions Mon Jul 14 21:51:56 2008 +0000 +++ b/scripts/functions Mon Jul 14 21:56:58 2008 +0000 @@ -3,11 +3,8 @@ # 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}]}'" @@ -114,7 +111,7 @@ local level="$1" shift CT_DoLog DEBUG "==> Executing: '${@}'" - eval "${@}" 2>&1 |CT_DoLog "${level}" + "${@}" 2>&1 |CT_DoLog "${level}" } # Tail message to be logged whatever happens