release: follow-up to previous commit to use Git for the ports tree

MFC after:	immediately (pending re approval)
Sponsored by:	Rubicon Communications, LLC ("Netgate")
This commit is contained in:
Glen Barber 2021-05-12 10:29:53 -04:00
parent 3f25cfea55
commit fb6e261c20

View File

@ -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