From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 13 Dec 2007 20:54:08 +0000 (-0000)
Subject: Disable the "QA Notice: Pre-stripped files" message when RESTRICT
X-Git-Tag: v2.2_pre1~183
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1e06bf675b9bcfaf29947db7810026fbdc9dd07b;p=portage.git

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.

svn path=/main/trunk/; revision=8915
---

diff --git a/bin/prepstrip b/bin/prepstrip
index 178b5c173..a5d4278de 100755
--- 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.