When die has been called and ${T}/environment does not exist,

dump the current environment to ${T}/die.env in case it helps
for debugging. (trunk r8783)

svn path=/main/branches/2.1.2/; revision=8784

diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh
index 9ac0d2f3a47cb090efb7d414a149318ddce355ec..0147a0b16fd7556e0af16528a59f1b02867824de 100644 (file)
--- a/bin/isolated-functions.sh
+++ b/bin/isolated-functions.sh
@@ -98,8 +98,15 @@ diefunc() {
        eerror "If you need support, post the topmost build error, and the call stack if relevant."
        [[ -n ${PORTAGE_LOG_FILE} ]] \
                && eerror "A complete build log is located at '${PORTAGE_LOG_FILE}'."
-       [ -f "${T}/environment" ] && \
+       if [ -f "${T}/environment" ] ; then
                eerror "The ebuild environment file is located at '${T}/environment'."
+       elif [ -d "${T}" ] ; then
+               {
+                       set
+                       export
+               } > "${T}/die.env"
+               eerror "The ebuild environment file is located at '${T}/die.env'."
+       fi
        if [[ -n ${EBUILD_OVERLAY_ECLASSES} ]] ; then
                eerror "This ebuild used the following eclasses from overlays:"
                local x