release: update workaround during transition to git

PR:		253181
Submitted by:	Yasuhiro Kimura
MFC after:	3 days
Sponsored by:	Rubicon Communications, LLC ("Netgate")
This commit is contained in:
Glen Barber 2021-02-02 12:19:36 -05:00
parent d0ca28d7c9
commit 70dfc101b6

View file

@ -246,8 +246,11 @@ 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
# 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