[gentoo-commits] proj/portage:master commit in: bin/install-qa-check.d/

[Zac Medico]

commit:     a2506e4ebd47781eb81b7d13b0a1a376ed028c77
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sun Nov  3 19:59:06 2019 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sun Nov  3 20:00:59 2019 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=a2506e4e

install-qa-check.d: handle libtool files and static libs from /

Fixes: 498900e5e514 ("install-qa-check.d: remove check that bans libtool files 
and static libs from /")
Bug: https://bugs.gentoo.org/699252
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 bin/install-qa-check.d/80libraries | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/install-qa-check.d/80libraries 
b/bin/install-qa-check.d/80libraries
index e59369bf6..806605293 100644
--- a/bin/install-qa-check.d/80libraries
+++ b/bin/install-qa-check.d/80libraries
@@ -139,7 +139,7 @@ lib_check() {
        # https://bugs.gentoo.org/4411
        local abort="no"
        local a s
-       for a in "${ED%/}"/usr/lib*/*.a ; do
+       for a in "${ED%/}"{/usr,}/lib*/*.a ; do
                s=${a%.a}.so
                if [[ ! -e ${s} ]] ; then
                        s=${s%usr/*}${s##*/usr/}
@@ -154,7 +154,7 @@ lib_check() {
 
        # Verify that the libtool files don't contain bogus $D entries.
        local abort=no gentoo_bug=no always_overflow=no
-       for a in "${ED%/}"/usr/lib*/*.la ; do
+       for a in "${ED%/}"{/usr,}/lib*/*.la ; do
                s=${a##*/}
                if grep -qs "${ED}" "${a}" ; then
                        __vecho -ne '\n'