From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id F3A79139694 for ; Wed, 2 Aug 2017 07:24:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5CE891FC09D; Wed, 2 Aug 2017 07:24:06 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3F0531FC09D for ; Wed, 2 Aug 2017 07:24:06 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4E6403417D4 for ; Wed, 2 Aug 2017 07:24:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id ED01A75EB for ; Wed, 2 Aug 2017 07:24:03 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1501658532.864585bc32dc0ccad8f53aec03d378d37b385c21.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: bin/install-qa-check.d/ X-VCS-Repository: proj/portage X-VCS-Files: bin/install-qa-check.d/80multilib-strict X-VCS-Directories: bin/install-qa-check.d/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 864585bc32dc0ccad8f53aec03d378d37b385c21 X-VCS-Branch: master Date: Wed, 2 Aug 2017 07:24:03 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: faf34935-a0fb-43cd-afc5-2edceda3d8b2 X-Archives-Hash: cff1ca54289547bfec9663ff4c07d0a3 commit: 864585bc32dc0ccad8f53aec03d378d37b385c21 Author: Zac Medico gentoo org> AuthorDate: Tue Aug 1 05:04:29 2017 +0000 Commit: Zac Medico gentoo org> CommitDate: Wed Aug 2 07:22:12 2017 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=864585bc multilib-strict: disable recursion into subdirectories (bug 424423) 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 Reviewed-by: Manuel Rüger gentoo.org> 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..afd223250 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}" | grep -Eq "${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