[PATCH] multilib-strict: disable recursion into subdirectories (bug 424423)

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

[PATCH] multilib-strict: disable recursion into subdirectories (bug 424423)

Zac Medico-2
Disable recursion into subdirectories, in order to avoid false-positives.
The MULTILIB_STRICT_EXEMPT variable only served to filter false-positives
that were triggered by recursion, so it will no longer be needed.

X-Gentoo-bug: 424423
X-Gentoo-bug-url: https://bugs.gentoo.org/show_bug.cgi?id=424423
---
 bin/install-qa-check.d/80multilib-strict | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/bin/install-qa-check.d/80multilib-strict b/bin/install-qa-check.d/80multilib-strict
index f944be9e6..21fe93d4b 100644
--- a/bin/install-qa-check.d/80multilib-strict
+++ b/bin/install-qa-check.d/80multilib-strict
@@ -6,14 +6,13 @@ multilib_strict_check() {
  then
  rm -f "${T}/multilib-strict.log"
  local abort=no dir file
- MULTILIB_STRICT_EXEMPT=$(echo ${MULTILIB_STRICT_EXEMPT} | sed -e 's:\([(|)]\):\\\1:g')
  for dir in ${MULTILIB_STRICT_DIRS} ; do
  [[ -d ${ED}/${dir} ]] || continue
- for file in $(find ${ED}/${dir} -type f | grep -v "^${ED}/${dir}/${MULTILIB_STRICT_EXEMPT}"); do
- if file ${file} | egrep -q "${MULTILIB_STRICT_DENY}" ; then
+ while read -r -d '' file; do
+ if file "${file}" | egrep -q "${MULTILIB_STRICT_DENY}" ; then
  echo "${file#${ED}//}" >> "${T}/multilib-strict.log"
  fi
- done
+ done < <(find "${ED}/${dir}" -maxdepth 1 -type f -print0)
  done
 
  if [[ -s ${T}/multilib-strict.log ]] ; then
--
2.13.0