From 02c51ccd7159c8ca40162bf0321ccd65190de521 Mon Sep 17 00:00:00 2001 From: Fabian Groffen Date: Wed, 10 Sep 2008 08:33:53 +0000 Subject: [PATCH] Merged from trunk -r11496:11498 | 11497 | In the ignored LDFLAGS check, filter out anything under | | zmedico | /usr/lib/debug/ in order to avoid duplicate warnings for | | | splitdebug files. Thanks to Cardoe for the suggestion. | | 11498 | Don't mention log files in $T for eqawarn messages since the | | zmedico | logs are likely to get removed and the user can just use the | | | log from elog anyway. Thanks to Jeremy Olexa | | | for the suggestion. | svn path=/main/branches/prefix/; revision=11499 --- bin/misc-functions.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh index 9ec255b8e..0a72aca1a 100644 --- a/bin/misc-functions.sh +++ b/bin/misc-functions.sh @@ -106,8 +106,7 @@ install_qa_check() { eqawarn " risk. On some architectures, the code may not even function" eqawarn " properly, if at all." eqawarn " For more information, see http://hardened.gentoo.org/pic-fix-guide.xml" - eqawarn " Please include this file in your report:" - eqawarn " ${T}/scanelf-textrel.log" + eqawarn " Please include the following list of files in your report:" eqawarn "${f}" vecho -ne '\a\n' die_msg="${die_msg} textrels," @@ -151,8 +150,7 @@ install_qa_check() { eqawarn " on some architectures/operating systems. A bug should be filed" eqawarn " at http://bugs.gentoo.org/ to make sure the file is fixed." eqawarn " For more information, see http://hardened.gentoo.org/gnu-stack.xml" - eqawarn " Please include this file in your report:" - eqawarn " ${T}/scanelf-execstack.log" + eqawarn " Please include the following list of files in your report:" eqawarn "${f}" vecho -ne '\a\n' die_msg="${die_msg} execstacks" @@ -179,13 +177,15 @@ install_qa_check() { set -${shopts} fi fi - sed -e "/^\$/d" -e "s#^#/#" -i "${T}"/scanelf-ignored-LDFLAGS.log + # Filter anything under /usr/lib/debug/ in order to avoid + # duplicate warnings for splitdebug files. + sed -e "s#^usr/lib/debug/.*##" -e "/^\$/d" -e "s#^#/#" \ + -i "${T}"/scanelf-ignored-LDFLAGS.log f=$(<"${T}"/scanelf-ignored-LDFLAGS.log) if [[ -n ${f} ]] ; then vecho -ne '\a\n' eqawarn "${BAD}QA Notice: Files built without respecting LDFLAGS have been detected${NORMAL}" - eqawarn " Please include this file in your report:" - eqawarn " ${T}/scanelf-ignored-LDFLAGS.log" + eqawarn " Please include the following list of files in your report:" eqawarn "${f}" vecho -ne '\a\n' sleep 1 -- 2.26.2