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 be0f2c5c088e27de9c8b072c4566b7c05cac826b..bfec2d64ea49a27b10f656fc9df082ddca344dc2 100755 (executable)
--- 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