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 76AF4158086 for ; Tue, 7 Dec 2021 10:55:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B69C12BC002; Tue, 7 Dec 2021 10:55:06 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 A883E2BC002 for ; Tue, 7 Dec 2021 10:55:05 +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 E6340343453 for ; Tue, 7 Dec 2021 10:55:02 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 415F710C for ; Tue, 7 Dec 2021 10:55:01 +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: <1638874415.46b44c2c2080582ca5c48925651ca385c233ffb8.grobian@gentoo> Subject: [gentoo-commits] repo/proj/prefix:master commit in: scripts/ X-VCS-Repository: repo/proj/prefix X-VCS-Files: scripts/bootstrap-prefix.sh X-VCS-Directories: scripts/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: 46b44c2c2080582ca5c48925651ca385c233ffb8 X-VCS-Branch: master Date: Tue, 7 Dec 2021 10:55:01 +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: daccb985-c15d-449c-b8e3-ce9a82efefe8 X-Archives-Hash: 14c6dab240d6a77b6bf5e4fa93ca3d9f commit: 46b44c2c2080582ca5c48925651ca385c233ffb8 Author: Fabian Groffen gentoo org> AuthorDate: Tue Dec 7 10:53:35 2021 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Tue Dec 7 10:53:35 2021 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=46b44c2c scripts/bootstrap-prefix.sh: fix errors recently introduced ./bootstrap-prefix.sh: line 1652: local: `ROOT/etc/portage/make.conf/': not a valid identifier the assignment doesn't quite like it to be broken up like this, don't know quite yet, but at least this fixes it Signed-off-by: Fabian Groffen gentoo.org> scripts/bootstrap-prefix.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh index 04a6ef37b1..ccbe9ef905 100755 --- a/scripts/bootstrap-prefix.sh +++ b/scripts/bootstrap-prefix.sh @@ -1648,12 +1648,12 @@ do_emerge_pkgs() { clang internal-glib ) - local override_make_conf_dir=\ - "${PORTAGE_OVERRIDE_EPREFIX}${MAKE_CONF_DIR#${ROOT}}" + local override_make_conf_dir="${PORTAGE_OVERRIDE_EPREFIX}${MAKE_CONF_DIR#${ROOT}}" if [[ " ${USE} " == *" prefix-stack "* ]] && [[ ${PORTAGE_OVERRIDE_EPREFIX} == */tmp ]] && - ! grep -Rq '^USE=".*" # by bootstrap-prefix.sh$' "${override_make_conf_dir}" + ! grep -Rq '^USE=".*" # by bootstrap-prefix.sh$' \ + "${override_make_conf_dir}" then # With prefix-stack, the USE env var does apply to the stacked # prefix only, not the base prefix (any more? since some portage