From: Fabian Groffen <grobian@gentoo.org>
Date: Sun, 27 Jan 2008 09:29:43 +0000 (-0000)
Subject: Move paths to the bottom, be more dense and print ${S} as it's often necessary when... 
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=08d35774536725e5e375a1d39565d6caef4546aa;p=portage.git

Move paths to the bottom, be more dense and print ${S} as it's often necessary when a package fails

svn path=/main/branches/prefix/; revision=9223
---

diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh
index ca971bfdf..f28d10121 100755
--- a/bin/isolated-functions.sh
+++ b/bin/isolated-functions.sh
@@ -99,17 +99,6 @@ die() {
 	eerror
 
 	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}'."
-	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
@@ -125,7 +114,6 @@ die() {
 		overlay=${overlay%/*}
 		eerror "This ebuild is from an overlay: '${overlay}/'"
 	fi
-	eerror
 
 	if [[ "${EBUILD_PHASE/depend}" == "${EBUILD_PHASE}" ]] ; then
 		local x
@@ -134,6 +122,19 @@ die() {
 		done
 	fi
 
+	[[ -n ${PORTAGE_LOG_FILE} ]] \
+		&& eerror "build log: '${PORTAGE_LOG_FILE}'"
+	if [ -f "${T}/environment" ] ; then
+		eerror "ebuild environment: '${T}/environment'"
+	elif [ -d "${T}" ] ; then
+		{
+			set
+			export
+		} > "${T}/die.env"
+		eerror "ebuild environment: '${T}/die.env'"
+	fi
+	eerror "S: '${S}'"
+
 	[ -n "${EBUILD_EXIT_STATUS_FILE}" ] && \
 		touch "${EBUILD_EXIT_STATUS_FILE}" &>/dev/null