Date: Thu, 13 May 2021 01:03:37 +0900 (JST) From: Yasuhiro Kimura <yasu@utahime.org> To: gjb@FreeBSD.org 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: <20210513.010337.560902240722301845.yasu@utahime.org> In-Reply-To: <202105121448.14CEmfJH042754@gitrepo.freebsd.org> References: <202105121448.14CEmfJH042754@gitrepo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
Hello Glen,
From: Glen Barber <gjb@FreeBSD.org>
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.
---
Yasuhiro Kimura
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20210513.010337.560902240722301845.yasu>