diff options
| author |   Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2008-07-14 21:56:58 (GMT) |
|---|---|---|
| committer | Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2008-07-14 21:56:58 (GMT) |
| commit | e377769fb19a01b03e0205960b74f4b2b87793b1 (patch) | |
| tree | d818bd2fba56f9419fdd71c2be121f4e7ef9056b /scripts | |
| parent | 99de054ddd225749ae223366a0756e816853f475 (diff) | |
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(-)
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/functions | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/scripts/functions b/scripts/functions index bfacf94..e44c29b 100644 --- a/scripts/functions +++ b/scripts/functions @@ -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 @@ CT_DoExecLog() { 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 |