mirror of
https://github.com/crosstool-ng/crosstool-ng.git
synced 2025-02-07 11:20:14 +00:00
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(-)
This commit is contained in:
parent
99de054ddd
commit
e377769fb1
@ -3,11 +3,8 @@
|
|||||||
# Licensed under the GPL v2. See COPYING in the root of this package
|
# Licensed under the GPL v2. See COPYING in the root of this package
|
||||||
|
|
||||||
# Prepare the fault handler
|
# Prepare the fault handler
|
||||||
CT_IN_FAULT_HANDLER=0
|
|
||||||
CT_OnError() {
|
CT_OnError() {
|
||||||
ret=$?
|
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}]}'"
|
CT_DoLog ERROR "Build failed in step '${CT_STEP_MESSAGE[${CT_STEP_COUNT}]}'"
|
||||||
for((step=(CT_STEP_COUNT-1); step>1; step--)); do
|
for((step=(CT_STEP_COUNT-1); step>1; step--)); do
|
||||||
CT_DoLog ERROR " called in step '${CT_STEP_MESSAGE[${step}]}'"
|
CT_DoLog ERROR " called in step '${CT_STEP_MESSAGE[${step}]}'"
|
||||||
@ -114,7 +111,7 @@ CT_DoExecLog() {
|
|||||||
local level="$1"
|
local level="$1"
|
||||||
shift
|
shift
|
||||||
CT_DoLog DEBUG "==> Executing: '${@}'"
|
CT_DoLog DEBUG "==> Executing: '${@}'"
|
||||||
eval "${@}" 2>&1 |CT_DoLog "${level}"
|
"${@}" 2>&1 |CT_DoLog "${level}"
|
||||||
}
|
}
|
||||||
|
|
||||||
# Tail message to be logged whatever happens
|
# Tail message to be logged whatever happens
|
||||||
|
Loading…
x
Reference in New Issue
Block a user