aboutsummaryrefslogtreecommitdiff
path: root/release/release.sh
diff options
context:
space:
mode:
authorGlen Barber <gjb@FreeBSD.org>2021-02-02 17:19:36 +0000
committerGlen Barber <gjb@FreeBSD.org>2021-02-02 17:19:36 +0000
commit70dfc101b6324b25ba353465f0d6c610399741fc (patch)
treeb07151186cb50bfdd0964cdef1124aa9ed14c210 /release/release.sh
parentd0ca28d7c9c7da80a62e4307fe37b923e32ca1bb (diff)
downloadsrc-70dfc101b6324b25ba353465f0d6c610399741fc.tar.gz
src-70dfc101b6324b25ba353465f0d6c610399741fc.zip
release: update workaround during transition to git
PR: 253181 Submitted by: Yasuhiro Kimura MFC after: 3 days Sponsored by: Rubicon Communications, LLC ("Netgate")
Diffstat (limited to 'release/release.sh')
-rwxr-xr-xrelease/release.sh7
1 files 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