summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-05-01 21:59:54 +0000
committerZac Medico <zmedico@gentoo.org>2009-05-01 21:59:54 +0000
commitbaacd2d8e14fc3216ec3012fe8cf5bf13fd42d58 (patch)
treea308df13229e581b2042a1ba45c46361a9e5279b
parentMake elog functions use read -r when splitting lines, so that backslashes (diff)
downloadportage-multirepo-baacd2d8e14fc3216ec3012fe8cf5bf13fd42d58.tar.gz
portage-multirepo-baacd2d8e14fc3216ec3012fe8cf5bf13fd42d58.tar.bz2
portage-multirepo-baacd2d8e14fc3216ec3012fe8cf5bf13fd42d58.zip
Bug #267175 - Instead of "poor code kills airplanes", say "install aborted
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. (trunk r13584) svn path=/main/branches/2.1.6/; revision=13585
-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 5e7d29b7..b3b01cbc 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