From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1419263-garchives=archives.gentoo.org@lists.gentoo.org>
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 8DA7B158094
for <garchives@archives.gentoo.org>; Mon, 18 Jul 2022 15:16:56 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id C630CE0ABF;
Mon, 18 Jul 2022 15:16:55 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 5FD2DE0ABF
for <gentoo-commits@lists.gentoo.org>; Mon, 18 Jul 2022 15:16:55 +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 71D37340CCC
for <gentoo-commits@lists.gentoo.org>; Mon, 18 Jul 2022 15:16:54 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id CB8B14EC
for <gentoo-commits@lists.gentoo.org>; Mon, 18 Jul 2022 15:16:52 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
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" <sam@gentoo.org>
Message-ID: <1658157406.095d8c5b040eb399c245db1d3923d6a85747bbcf.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: 095d8c5b040eb399c245db1d3923d6a85747bbcf
X-VCS-Branch: master
Date: Mon, 18 Jul 2022 15:16:52 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: df0e8a3a-41f3-47a8-93e3-2fa5d414de3d
X-Archives-Hash: 72f21ca88fa3d5e4cf6282323039afe9
commit: 095d8c5b040eb399c245db1d3923d6a85747bbcf
Author: Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 18 15:04:02 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jul 18 15:16:46 2022 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=095d8c5b
estrip: fix double prefix
The content of build-info/NEEDED is with EPREFIX, the following sed
should only prepend the paths with D.
Bug: https://bugs.gentoo.org/749624
Bug: https://bugs.gentoo.org/858818
Reference: https://github.com/gentoo/portage/pull/794
Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org>
Signed-off-by: Sam James <sam <AT> gentoo.org>
bin/estrip | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/bin/estrip b/bin/estrip
index 686afb763..1e3f21e73 100755
--- a/bin/estrip
+++ b/bin/estrip
@@ -412,7 +412,7 @@ done < <(
(
find "$@" -type f ! -type l -name '*.a'
cut -d ' ' -f1 < "${PORTAGE_BUILDDIR}"/build-info/NEEDED \
- | sed -e "s:^:${ED}:"
+ | sed -e "s:^:${D}:"
) | LC_ALL=C sort -u
)
else