summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-05-01 21:59:43 +0000
committerZac Medico <zmedico@gentoo.org>2009-05-01 21:59:43 +0000
commite118fc3c3c1c4a3994289aad86821e8104838507 (patch)
tree5ccbcc2e6d07b6979c417c63aa6a5159ea9404d1
parentMake elog functions use read -r when splitting lines, so that backslashes (diff)
downloadportage-2.2_rc32.tar.gz
portage-2.2_rc32.tar.bz2
portage-2.2_rc32.zip
Bug #267175 - Instead of "poor code kills airplanes", say "install abortedv2.2_rc32
due to poor programming practices shown above" in order to help the user link the die message to the related "poor programming practices" messages. Thanks to Jeremy Olexa <darkside@g.o> for the suggestion. svn path=/main/trunk/; revision=13584
-rwxr-xr-xbin/misc-functions.sh6
1 files changed, 4 insertions, 2 deletions
diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh
index 5e7d29b79..b3b01cbc1 100755
--- a/bin/misc-functions.sh
+++ b/bin/misc-functions.sh
@@ -418,14 +418,16 @@ install_qa_check() {
fi
if [[ ${abort} == "yes" ]] ; then
if [[ ${gentoo_bug} == "yes" ]] ; then
- die "poor code kills airplanes"
+ die "install aborted due to" \
+ "poor programming practices shown above"
else
echo "Please do not file a Gentoo bug and instead" \
"report the above QA issues directly to the upstream" \
"developers of this software." | fmt -w 70 | \
while read line ; do eqawarn "${line}" ; done
eqawarn "Homepage: ${HOMEPAGE}"
- hasq stricter ${FEATURES} && die "poor code kills airplanes"
+ hasq stricter ${FEATURES} && die "install aborted due to" \
+ "poor programming practices shown above"
fi
fi
fi