diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2010-08-13 09:37:15 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-08-13 09:37:15 -0700 |
| commit | 2ebdc234f035e14d15091081952d70fba472b967 (patch) | |
| tree | 1c4b27e1cb3f4d0cef8d588a7f80a34246f369ba /bin/isolated-functions.sh | |
| parent | Remove message about race conditions in die, solved by EbuildIpcDaemon. (diff) | |
| download | portage-2ebdc234f035e14d15091081952d70fba472b967.tar.gz portage-2ebdc234f035e14d15091081952d70fba472b967.tar.bz2 portage-2ebdc234f035e14d15091081952d70fba472b967.zip | |
Disable the die() stack trace when called by the die helper.
Diffstat (limited to 'bin/isolated-functions.sh')
| -rw-r--r-- | bin/isolated-functions.sh | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh index 14ba58cc8..24adb697d 100644 --- a/bin/isolated-functions.sh +++ b/bin/isolated-functions.sh @@ -113,6 +113,8 @@ 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 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:" @@ -138,6 +140,7 @@ die() { | sed -e '1d' -e 's:^:RETAIN-LEADING-SPACE:' \ | while read -r n ; do eerror " ${n#RETAIN-LEADING-SPACE}" ; done eerror + fi eerror "If you need support, post the output of 'emerge --info =$CATEGORY/$PF'," eerror "the complete build log and the output of 'emerge -pqv =$CATEGORY/$PF'." if [[ -n ${EBUILD_OVERLAY_ECLASSES} ]] ; then |