Disable the "QA Notice: Pre-stripped files" message when RESTRICT

contains "strip" or "binchecks". This is needed at least for the
glibc ebuild since it calls prepallstrip directly, resulting in
it being called twice. Thanks to loki_val for reporting.
(trunk r8915)

svn path=/main/branches/2.1.2/; revision=8916

diff --git a/bin/prepstrip b/bin/prepstrip
index 178b5c173a30123a11b1af38392646bf3852afe2..a5d4278deed276957017ea43405bf0e8ad03af5b 100755 (executable)
--- a/bin/prepstrip
+++ b/bin/prepstrip
@@ -66,12 +66,15 @@ save_elf_debug() {
 # The existance of the section .symtab tells us that a binary is stripped.
 # We want to log already stripped binaries, as this may be a QA violation.
 # They prevent us from getting the splitdebug data.
-f=$(scanelf -yqRBF '#k%F' -k '!.symtab' "$@")
-if [[ -n ${f} ]] ; then
-       vecho -e "\a\n"
-       eqawarn "QA Notice: Pre-stripped files found:"
-       eqawarn "${f}"
-       echo "${f}" > "${T}"/scanelf-already-stripped.log
+if ! hasq binchecks ${RESTRICT} && \
+       ! hasq strip ${RESTRICT} ; then
+       f=$(scanelf -yqRBF '#k%F' -k '!.symtab' "$@")
+       if [[ -n ${f} ]] ; then
+               vecho -e "\a\n"
+               eqawarn "QA Notice: Pre-stripped files found:"
+               eqawarn "${f}"
+               echo "${f}" > "${T}"/scanelf-already-stripped.log
+       fi
 fi
 
 # Now we look for unstripped binaries.