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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0719C138206 for ; Tue, 16 Jan 2018 04:23:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 44A2BE0936; Tue, 16 Jan 2018 04:23:01 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1F776E0936 for ; Tue, 16 Jan 2018 04:23:00 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2A426335C3A for ; Tue, 16 Jan 2018 04:22:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B1B321A4 for ; Tue, 16 Jan 2018 04:22:56 +0000 (UTC) From: "Benda XU" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Benda XU" Message-ID: <1516076536.ea38c545ce810d80aea1eb7c6e5e4d2117e6f211.heroxbd@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: heroxbd X-VCS-Committer-Name: Benda XU X-VCS-Revision: ea38c545ce810d80aea1eb7c6e5e4d2117e6f211 X-VCS-Branch: master Date: Tue, 16 Jan 2018 04:22:56 +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-Archives-Salt: 4386cf6f-549c-4b25-bb21-de5622ac17d3 X-Archives-Hash: 49ece41ee188899b3ba05092ad9bc80b commit: ea38c545ce810d80aea1eb7c6e5e4d2117e6f211 Author: Benda Xu gentoo org> AuthorDate: Tue Jan 16 04:21:00 2018 +0000 Commit: Benda XU gentoo org> CommitDate: Tue Jan 16 04:22:16 2018 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=ea38c545 bootstrap-prefix.sh: do not take a shortcut if ! is-rap. scripts/bootstrap-prefix.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh index a1cc564f61..1119dabc06 100755 --- a/scripts/bootstrap-prefix.sh +++ b/scripts/bootstrap-prefix.sh @@ -1163,6 +1163,12 @@ bootstrap_bzip2() { } bootstrap_stage_host_gentoo() { + if ! is-rap ; then + einfo "Shortcut only supports prefix-standalone, but we are bootstrapping" + einfo "prefix-rpath. Do nothing." + return 0 + fi + if [[ ! -L ${ROOT}/tmp ]] ; then if [[ -e ${ROOT}/tmp ]] ; then einfo "${ROOT}/tmp exists and is not a symlink to ${HOST_GENTOO_EROOT}" @@ -2305,7 +2311,7 @@ EOF # Figure out if we are bootstrapping from an existing Gentoo # It can be forced by setting HOST_GENTOO_EROOT manually local t_GENTOO_EROOT=$(env -u EPREFIX portageq envvar EROOT 2> /dev/null) - if [[ ! -d ${HOST_GENTOO_EROOT} ]] && [[ -d ${t_GENTOO_EROOT} ]]; then + if [[ ! -d ${HOST_GENTOO_EROOT} && -d ${t_GENTOO_EROOT} ]]; then cat <