The branch main has been updated by gjb: URL: https://cgit.FreeBSD.org/src/commit/?id=70dfc101b6324b25ba353465f0d6c610399741fc
commit 70dfc101b6324b25ba353465f0d6c610399741fc Author: Glen Barber <[email protected]> AuthorDate: 2021-02-02 17:19:36 +0000 Commit: Glen Barber <[email protected]> CommitDate: 2021-02-02 17:19:36 +0000 release: update workaround during transition to git PR: 253181 Submitted by: Yasuhiro Kimura MFC after: 3 days Sponsored by: Rubicon Communications, LLC ("Netgate") --- release/release.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/release/release.sh b/release/release.sh index fbd64bb8234d..372f69177f7e 100755 --- a/release/release.sh +++ b/release/release.sh @@ -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 _______________________________________________ [email protected] mailing list https://lists.freebsd.org/mailman/listinfo/dev-commits-src-main To unsubscribe, send any mail to "[email protected]"
