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 3E8F415838C for ; Thu, 18 Jan 2024 09:36:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 803DCE2AA1; Thu, 18 Jan 2024 09:36:42 +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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 59E09E2AA1 for ; Thu, 18 Jan 2024 09:36:42 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 5A0CD34316D for ; Thu, 18 Jan 2024 09:36:41 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8D7FE979 for ; Thu, 18 Jan 2024 09:36:39 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1705570525.ded2ef9b14efaebe080d3c228832cac7b48639e7.grobian@gentoo> Subject: [gentoo-commits] proj/portage:prefix commit in: / X-VCS-Repository: proj/portage X-VCS-Files: autogen.sh subst-install.in X-VCS-Directories: / X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: ded2ef9b14efaebe080d3c228832cac7b48639e7 X-VCS-Branch: prefix Date: Thu, 18 Jan 2024 09:36:39 +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: b4b9201d-1576-41cf-a685-c0a94d9fe545 X-Archives-Hash: f581a5a4c57d73ee573741d7a5d5982b commit: ded2ef9b14efaebe080d3c228832cac7b48639e7 Author: Fabian Groffen gentoo org> AuthorDate: Thu Jan 18 09:35:25 2024 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Thu Jan 18 09:35:25 2024 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=ded2ef9b buildsys: fix hprefixify replacement logic for subst-inst We don't need to escape \ in single-quoted strings. Signed-off-by: Fabian Groffen gentoo.org> autogen.sh | 3 --- subst-install.in | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/autogen.sh b/autogen.sh index ec510e01b0..463753c459 100755 --- a/autogen.sh +++ b/autogen.sh @@ -13,7 +13,4 @@ autoconf || die "failed autoconf" touch ChangeLog automake -a -c || die "failed automake" -if [ -x ./test.sh ] ; then - exec ./test.sh "$@" -fi echo "finished" diff --git a/subst-install.in b/subst-install.in index acc7824c4b..423dfad515 100644 --- a/subst-install.in +++ b/subst-install.in @@ -35,8 +35,8 @@ sedexp=( -e "s,${at}rootuid${at},@rootuid@,g" -e "s,${at}rootuser${at},${rootuser},g" -e "s,${at}sysconfdir${at},@sysconfdir@,g" - -e 's,([^[:alnum:]}\\)\\.])'"${dirs}"',\\1@PORTAGE_EPREFIX@/\\2,g' - -e 's,^'"${dirs}"',@PORTAGE_EPREFIX@/\\1,' + -e 's,([^[:alnum:]}\)\.])'"${dirs}"',\1@PORTAGE_EPREFIX@/\2,g' + -e 's,^'"${dirs}"',@PORTAGE_EPREFIX@/\1,' ) sources=( )