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 9B08E138334 for ; Mon, 25 Mar 2019 08:03:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B8BDAE096A; Mon, 25 Mar 2019 08:03:03 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 944E5E096A for ; Mon, 25 Mar 2019 08:03:03 +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 9664D335CCF for ; Mon, 25 Mar 2019 08:03:01 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E9CB753A for ; Mon, 25 Mar 2019 08:02:59 +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: <1553500904.01c51c1f3c8868e6b8c6a59c84304d971cd4aea7.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: 01c51c1f3c8868e6b8c6a59c84304d971cd4aea7 X-VCS-Branch: master Date: Mon, 25 Mar 2019 08:02:59 +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: 7fd99c46-d95d-4d23-bdd7-25f85c9955e6 X-Archives-Hash: 82e26d25bd04f7429ae585c110afcd28 commit: 01c51c1f3c8868e6b8c6a59c84304d971cd4aea7 Author: Fabian Groffen gentoo org> AuthorDate: Mon Mar 25 08:01:44 2019 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Mon Mar 25 08:01:44 2019 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=01c51c1f scripts/bootstrap-prefix: ensure we don't use mirrors for latest tree In do_tree, ensure that we don't end up using mirrors to fetch a daily snapshot. The purpose of those is to be fresh, so we don't want a stale copy. Signed-off-by: Fabian Groffen gentoo.org> scripts/bootstrap-prefix.sh | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh index 7cb83cf84d..c91f6393e4 100755 --- a/scripts/bootstrap-prefix.sh +++ b/scripts/bootstrap-prefix.sh @@ -554,10 +554,18 @@ do_tree() { mkdir -p "${PORTDIR}" if [[ ! -e ${PORTDIR}/.unpacked ]]; then - efetch "$1/$2" || return 1 + # latest tree cannot be fetched from mirrors, always have to + # respect the source to get the latest + if [[ -n ${LATEST_TREE_YES} ]] ; then + echo "$1" + ( export GENTOO_MIRRORS= ; efetch "$1/$2" ) || return 1 + else + efetch "$1/$2" || return 1 + fi [[ -e ${PORTDIR} ]] || mkdir -p ${PORTDIR} einfo "Unpacking, this may take a while" - bzip2 -dc ${DISTDIR}/$2 | tar -xf - -C ${PORTDIR} --strip-components=1 || return 1 + bzip2 -dc ${DISTDIR}/$2 | \ + tar -xf - -C ${PORTDIR} --strip-components=1 || return 1 touch ${PORTDIR}/.unpacked fi } @@ -2036,7 +2044,7 @@ set_helper_vars() { GNU_URL=${GNU_URL:="http://ftp.gnu.org/gnu"} DISTFILES_G_O="http://distfiles.gentoo.org" GENTOO_MIRRORS=${GENTOO_MIRRORS:=${DISTFILES_G_O}} - SNAPSHOT_HOST=$(rapx ${GENTOO_MIRRORS} http://rsync.prefix.bitzolder.nl) + SNAPSHOT_HOST=$(rapx ${DISTFILES_G_O} http://rsync.prefix.bitzolder.nl) SNAPSHOT_URL=${SNAPSHOT_URL:-"${SNAPSHOT_HOST}/snapshots"} GCC_APPLE_URL="http://www.opensource.apple.com/darwinsource/tarballs/other"