From 4973cc7e046d24c33a53eb14218f43d9e5031876 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sun, 30 Jan 2011 14:19:13 -0800 Subject: isolated-functions.sh: fix syntax error for die Fix die so that dump_trace is not called when the main script is a helper binary. This prevents the following error message when a helper dies automatically in EAPI 4: isolated-functions.sh: line 61: p -= : syntax error: operand expected (error token is "-= ") --- bin/isolated-functions.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'bin') diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh index 1403c0aac..8af202f65 100644 --- a/bin/isolated-functions.sh +++ b/bin/isolated-functions.sh @@ -139,8 +139,10 @@ die() { eerror "ERROR: $CATEGORY/$PF failed:" eerror " ${*:-(no error message)}" eerror - # This part is useless when called by the die helper. - if [[ ${BASH_SOURCE[1]##*/} != die ]] ; then + # dump_trace is useless when the main script is a helper binary + local main_index + (( main_index = ${#BASH_SOURCE[@]} - 1 )) + if has ${BASH_SOURCE[$main_index]##*/} ebuild.sh misc-functions.sh ; then dump_trace 2 ${filespacing} ${linespacing} eerror " $(printf "%${filespacing}s" "${BASH_SOURCE[1]##*/}"), line $(printf "%${linespacing}s" "${BASH_LINENO[0]}"): Called die" eerror "The specific snippet of code:" -- cgit v1.2.3-1-g7c22