From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 9 Oct 2009 07:01:55 +0000 (-0000)
Subject: Bug #270933 - Make the "If you need support ..." message ask for emerge
X-Git-Tag: v2.2_rc45~21
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=20f87bcff47263499ddf8ca24885edb2d79ca587;p=portage.git

Bug #270933 - Make the "If you need support ..." message ask for emerge
--info and the build.log. Thanks to Sebastian Mingramm (few) for this
patch.

svn path=/main/trunk/; revision=14521
---

diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh
index be0f2c5c0..bfec2d64e 100755
--- a/bin/isolated-functions.sh
+++ b/bin/isolated-functions.sh
@@ -121,7 +121,8 @@ die() {
 		| sed -e '1d' -e 's:^:RETAIN-LEADING-SPACE:' \
 		| while read -r n ; do eerror "  ${n#RETAIN-LEADING-SPACE}" ; done
 	eerror
-	eerror "If you need support, post the topmost build error, and the call stack if relevant."
+	eerror "If you need support, post emerge --info, the complete build log"
+	eerror "and the output of emerge -pqv =$CATEGORY/$PF."
 	if [[ -n ${EBUILD_OVERLAY_ECLASSES} ]] ; then
 		eerror "This ebuild used the following eclasses from overlays:"
 		local x
@@ -158,7 +159,7 @@ die() {
 	fi
 
 	[[ -n ${PORTAGE_LOG_FILE} ]] \
-		&& eerror "A complete build log is located at '${PORTAGE_LOG_FILE}'."
+		&& eerror "The 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