summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2007-12-13 20:54:08 +0000
committerZac Medico <zmedico@gentoo.org>2007-12-13 20:54:08 +0000
commit1e06bf675b9bcfaf29947db7810026fbdc9dd07b (patch)
tree30f5563b1427ace8ff8e8be3707a4e04a4756dd5
parentb5aed0929e51116b1b75c7d9c9458db3c25917c0 (diff)
downloadportage-1e06bf675b9bcfaf29947db7810026fbdc9dd07b.tar.gz
portage-1e06bf675b9bcfaf29947db7810026fbdc9dd07b.tar.bz2
portage-1e06bf675b9bcfaf29947db7810026fbdc9dd07b.zip
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
-rwxr-xr-xbin/prepstrip15
1 files changed, 9 insertions, 6 deletions
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.