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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D281C158095 for ; Sat, 6 Aug 2022 21:01:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 84199E0CAB; Sat, 6 Aug 2022 21:01:27 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B1D25E0CAB for ; Sat, 6 Aug 2022 21:01:26 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 595E634122C for ; Sat, 6 Aug 2022 21:01:25 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B94BA565 for ; Sat, 6 Aug 2022 21:01:23 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1659819628.4af780be38037391751bccc6e15fc2561b8970e0.sam@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: bin/ X-VCS-Repository: proj/portage X-VCS-Files: bin/estrip X-VCS-Directories: bin/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 4af780be38037391751bccc6e15fc2561b8970e0 X-VCS-Branch: master Date: Sat, 6 Aug 2022 21:01:23 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 5778b849-dd18-4779-9482-c982a280d4bc X-Archives-Hash: b6c4dca777c5f283ff40576b41a6d1b1 commit: 4af780be38037391751bccc6e15fc2561b8970e0 Author: Sam James gentoo org> AuthorDate: Mon Aug 1 01:40:44 2022 +0000 Commit: Sam James gentoo org> CommitDate: Sat Aug 6 21:00:28 2022 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=4af780be estrip: use while/read for prepstrip (< EAPI 7) Signed-off-by: Sam James gentoo.org> bin/estrip | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/bin/estrip b/bin/estrip index f45211bdb..0ed35111d 100755 --- a/bin/estrip +++ b/bin/estrip @@ -419,9 +419,10 @@ while read -r x ; do done < <( # NEEDED may not exist for some packages (bug #862606) if [[ -f "${PORTAGE_BUILDDIR}"/build-info/NEEDED ]] ; then - needed_contents=$(cat "${PORTAGE_BUILDDIR}"/build-info/NEEDED | cut -d ' ' -f1 | sed -e "s:^:${D%/}:") - else - needed_contents="" + while IFS= read -r needed_entry ; do + needed_entry="${needed_entry% *}" + needed_contents+=( "${D%/}${needed_entry}" ) + done < "${PORTAGE_BUILDDIR}"/build-info/NEEDED fi # Use sort -u to eliminate duplicates (bug #445336). @@ -429,8 +430,6 @@ done < <( [[ -n ${needed_contents[@]} ]] && printf "%s\n" "${needed_contents[@]}" find "$@" -type f ! -type l -name '*.a' ) | LC_ALL=C sort -u - - unset needed_contents ) else while IFS= read -d '' -r x ; do