diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-01-30 14:19:13 -0800 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-01-30 14:19:13 -0800 |
| commit | 4973cc7e046d24c33a53eb14218f43d9e5031876 (patch) | |
| tree | b5f6e38ddef921627a2a84df5bfc437055c7f0dd | |
| parent | 71f98544eb0436c065dabbe5cfd8cecaa972f2e4 (diff) | |
| download | portage-4973cc7e046d24c33a53eb14218f43d9e5031876.tar.gz portage-4973cc7e046d24c33a53eb14218f43d9e5031876.tar.bz2 portage-4973cc7e046d24c33a53eb14218f43d9e5031876.zip | |
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 "-= ")
| -rw-r--r-- | bin/isolated-functions.sh | 6 |
1 files changed, 4 insertions, 2 deletions
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:" |