diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-01-30 15:24:48 -0800 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-01-30 15:24:48 -0800 |
| commit | 77f39aae4f2f3604407ca942bbfa58ef51bfa3a8 (patch) | |
| tree | 7f18500cd5d4cb537f8a913deea8c236743e25a5 | |
| parent | a512ab7996d7346dc4d058ba49f8442dc5c0e705 (diff) | |
| download | portage-77f39aae4f2f3604407ca942bbfa58ef51bfa3a8.tar.gz portage-77f39aae4f2f3604407ca942bbfa58ef51bfa3a8.tar.bz2 portage-77f39aae4f2f3604407ca942bbfa58ef51bfa3a8.zip | |
die: include $EBUILD_PHASE in message
When a helper binary dies automatically in EAPI 4 and later, we don't
get a stack trace, so at least report the phase that failed.
| -rw-r--r-- | bin/isolated-functions.sh | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh index 8af202f65..f89c11ed5 100644 --- a/bin/isolated-functions.sh +++ b/bin/isolated-functions.sh @@ -136,7 +136,11 @@ die() { (( n-- )) done - eerror "ERROR: $CATEGORY/$PF failed:" + # When a helper binary dies automatically in EAPI 4 and later, we don't + # get a stack trace, so at least report the phase that failed. + local phase_str= + [[ -n $EBUILD_PHASE ]] && phase_str=" ($EBUILD_PHASE phase)" + eerror "ERROR: $CATEGORY/$PF failed${phase_str}:" eerror " ${*:-(no error message)}" eerror # dump_trace is useless when the main script is a helper binary |