[gentoo-commits] portage r11499 - main/branches/prefix/bin

[gentoo-commits] portage r11499 - main/branches/prefix/bin

[Fabian Groffen (grobian)]

Author: grobian
Date: 2008-09-10 08:33:53 +0000 (Wed, 10 Sep 2008)
New Revision: 11499

Modified:
   main/branches/prefix/bin/misc-functions.sh
Log:
   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 <darkside@g.o>  |
   |         | for the suggestion.                                          |


Modified: main/branches/prefix/bin/misc-functions.sh
===================================================================
--- main/branches/prefix/bin/misc-functions.sh	2008-09-06 22:57:28 UTC (rev 11498)
+++ main/branches/prefix/bin/misc-functions.sh	2008-09-10 08:33:53 UTC (rev 11499)
@@ -106,8 +106,7 @@
 			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 @@
 			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 @@
 						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