On Thu, May 13, 2021 at 01:03:37AM +0900, Yasuhiro Kimura wrote: > Hello Glen, > > From: Glen Barber <[email protected]> > Subject: git: fb6e261c20eb - main - release: follow-up to previous commit to > use Git for the ports tree > Date: Wed, 12 May 2021 14:48:41 GMT > > > 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 > > This should be such as following. > > ---------------------------------------------------------------------- > 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 > ---------------------------------------------------------------------- > > Or ports tree isn't checked out when build is from scratch. >
Bah, you're right. I fixed it in stable/13 without noticing it was needed here, too. Thanks for spotting this. Glen
signature.asc
Description: PGP signature
