From owner-dev-commits-src-main@freebsd.org Wed May 12 16:10:51 2021 Return-Path: Delivered-To: dev-commits-src-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 226556446BE; Wed, 12 May 2021 16:10:51 +0000 (UTC) (envelope-from gjb@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "freefall.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FgKXC0SKSz4ngT; Wed, 12 May 2021 16:10:51 +0000 (UTC) (envelope-from gjb@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1620835851; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=YuRK6vs4aeCb/p8Z+t1qHEjnFu/7tia3v7UUFSp14+g=; b=oFEbPFjSNIsC2iG3+xC5r6HRq2I3y3eaY8+e6svPuxIspdA9BTFZfS7CZj4nFY872WqGpW 1gtnOU0PfKHn3gf/ra2u3CG66hlDB7/ew4el7+kG+i46yYtLNwHEsH1XfWvHD9CbWInNSU diUiAu7gZHw1KnBPfupQZbC95XJQVpi3qow+iOlfB2ZE0vjUDie+GnlyaMYDIJ3TZ5pE4F /3oVuh/adlbCiX6gPtmSGGM7LMiFd/mHn19JsChbQkrO7mAl9Ug4d4f+LLEIrYmWYvCppO Aq6LZ/0GDYSnukGpDDYfRsthm7sjnXTYr3dzQZXzZ4xSYgNz86mviHxDpvb7Cw== Received: from FreeBSD.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by freefall.freebsd.org (Postfix) with ESMTPS id 95AFC18C19; Wed, 12 May 2021 16:10:50 +0000 (UTC) (envelope-from gjb@freebsd.org) Date: Wed, 12 May 2021 16:10:48 +0000 From: Glen Barber To: Yasuhiro Kimura Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: fb6e261c20eb - main - release: follow-up to previous commit to use Git for the ports tree Message-ID: <20210512161048.GK92026@FreeBSD.org> References: <202105121448.14CEmfJH042754@gitrepo.freebsd.org> <20210513.010337.560902240722301845.yasu@utahime.org> <20210512160645.GJ92026@FreeBSD.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="+yydNiOxrtWvz4sx" Content-Disposition: inline In-Reply-To: <20210512160645.GJ92026@FreeBSD.org> ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1620835851; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=YuRK6vs4aeCb/p8Z+t1qHEjnFu/7tia3v7UUFSp14+g=; b=mMFWGhhCCWpgqPTPkxUGMYtBCNcEpQjj/SVNVhi36YuGJ7JaRktMlcWROxB1ttFtOcIgcJ i4udx/XLtaVNu+k/lMP7Rs1tZFNmYXeGSDHuJLocrltPTcCIqI9neqrC6G8+y7mZO74Z2/ khBEU0rkb3ZdHbBCnhN/vFiu/da/cwstf6DO3F+cAlgKWVqY7Wl/Wl2MY0+xRm9z4tc/Zp uR1NUEqXmbBJ0Vc0lHpczzBb/iq0spmrFaAddlu3mnmx8+k6whMA91Bmd1zzIU0hr63D2m wq1EOl2OxB0xICYuxBcdpWxxePCEcRrS1cxIuB0b8b68p2zKhBAo9d4UcdX1ag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1620835851; a=rsa-sha256; cv=none; b=ykVRhs3u07rNzkOdpN3Y5Flcgb8KLEISlRsq0qDNsrRQxZiHUFcLt4MvPB40Jy9PL270KU 5SNg3ZR3KVgjZQ3MVcaVVwgjK+7iSpUfrZ4J75xW5NLUuYyKGntX2jaqg/hgQEabdeedki VX70ewjggezlwen9ABP0nGu73678WWwmcFpAtNVWXiyj79TE986SkBJWoHBrsUyKSdxTqW aKTXeAswAbekRb3gWwNPjLtnyDQ0i6koCnY0BlLwieu7HMEbFYbn2r63vqP1kkyA2MiTk9 s9IDXrthlMnSKlGVQmdGCXsWF6BV+eW5SI+ZgHZVgVRMTt/i6IRJL846pZC+lg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 May 2021 16:10:51 -0000 --+yydNiOxrtWvz4sx Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, May 12, 2021 at 04:06:45PM +0000, Glen Barber wrote: > On Thu, May 13, 2021 at 01:03:37AM +0900, Yasuhiro Kimura wrote: > > Hello Glen, > >=20 > > From: Glen Barber > > Subject: git: fb6e261c20eb - main - release: follow-up to previous comm= it to use Git for the ports tree > > Date: Wed, 12 May 2021 14:48:41 GMT > >=20 > > > diff --git a/release/release.sh b/release/release.sh > > > index 84a7813205f9..87e22e669fd1 100755 > > > --- a/release/release.sh > > > +++ b/release/release.sh > > > @@ -222,16 +222,8 @@ chroot_setup() { > > > fi > > > fi > > > if [ -z "${NOPORTS}" ] && [ -z "${PORTS_UPDATE_SKIP}" ]; then > > > - # if [ -d "${CHROOTDIR}/usr/ports/.git" ]; then > > > - # git -C ${CHROOTDIR}/usr/ports pull -q > > > - # XXX: Workaround for the overlap in the Git conversion timeframe. > > > - if [ -d "${CHROOTDIR}/usr/ports/.svn" ]; then > > > - ${SVNCMD} update ${CHROOTDIR}/usr/ports > > > - else > > > - #${VCSCMD} ${PORT} -b ${PORTBRANCH} ${CHROOTDIR}/usr/ports > > > - # XXX: Workaround for the overlap in the Git > > > - # conversion timeframe. > > > - ${SVNCMD} co ${PORT}/${PORTBRANCH} ${CHROOTDIR}/usr/ports > > > + if [ -d "${CHROOTDIR}/usr/ports/.git" ]; then > > > + git -C ${CHROOTDIR}/usr/ports pull -q > > > fi > > > fi > >=20 > > This should be such as following. > >=20 > > ---------------------------------------------------------------------- > > if [ -z "${NOPORTS}" ] && [ -z "${PORTS_UPDATE_SKIP}" ]; then > > - # if [ -d "${CHROOTDIR}/usr/ports/.git" ]; then > > - # git -C ${CHROOTDIR}/usr/ports pull -q > > - # XXX: Workaround for the overlap in the Git conversion timeframe. > > - if [ -d "${CHROOTDIR}/usr/ports/.svn" ]; then > > - ${SVNCMD} update ${CHROOTDIR}/usr/ports > > - else > > - #${VCSCMD} ${PORT} -b ${PORTBRANCH} ${CHROOTDIR}/usr/ports > > - # XXX: Workaround for the overlap in the Git > > - # conversion timeframe. > > - ${SVNCMD} co ${PORT}/${PORTBRANCH} ${CHROOTDIR}/usr/ports > > + if [ -d "${CHROOTDIR}/usr/ports/.git" ]; then > > + git -C ${CHROOTDIR}/usr/ports pull -q > > + else > > + ${VCSCMD} ${PORT} -b ${PORTBRANCH} ${CHROOTDIR}/usr/ports > > fi > > fi > > ---------------------------------------------------------------------- > >=20 > > Or ports tree isn't checked out when build is from scratch. > >=20 >=20 > Bah, you're right. I fixed it in stable/13 without noticing it was > needed here, too. >=20 > Thanks for spotting this. >=20 Oops. It turns out I did not fix this in stable/13. I pushed an update there, too. Glen --+yydNiOxrtWvz4sx Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEjRJAPC5sqwhs9k2jAxRYpUeP4pMFAmCb/ggACgkQAxRYpUeP 4pOopg//exr/7nEUuIMBv3rUEn97TCTRwi6Bl3bRFo2249u/AfZDSiQnCNcCN7pL CpVJo05vOGZVO96jNudq1pxrJqoolevep0wnrz898M73IgiVfoktuhU8i+dqfKHZ imXaDDlt5sDfi0BNbraXZ7OEUFtI2LklwIiilHQYiC5oA4+nbfFKJDnmnZLbEv4T u7CXZ8Fi1E7TR/tZx7lSzXxsclUcAfUi1y90kJL0S7+yYTAKcd16PD95N6NE2SQG 8oh1p642DNuXuqxqLXnfD4gcs8x6BNraPT4GhJIoG/SX9iyWesnGJBish6iopbXV 8Pjujg58EEwH0dOjDrgA3nroXBcLoydYf7JbkI7xcIFNxH5UFBTiECmv295RKNQW g90zeGswCDz/2P/7Vc8mVPER1Ndjdcn1skBEMu6dYD2bFpOJPC69SfndKEarTCdP PcDd+PJmICG2Nleg1fpBfZG/vawIXIZjA5ljpktS1WjgVUN13R7/vMauH0n0MgLU EIrum5FR2z0kA9w2eNls+g5cLqgN5L419D9xnkjJ2rpLVgKQNhs0Ih/0hLLRwVut uL7MQ4pxC1ObeLVjYSYWNfgCbLivEGt9jTisiMZGA+d0vlCuoosetjc7nbwncapP +nM7GdJtj7kZ9ji4RV8+pzYRlGI5yLp8MIORr2i1iuFfZWeXwpQ= =iLd8 -----END PGP SIGNATURE----- --+yydNiOxrtWvz4sx--