aboutsummaryrefslogtreecommitdiff
path: root/release
diff options
context:
space:
mode:
authorGlen Barber <gjb@FreeBSD.org>2021-05-12 14:29:53 +0000
committerGlen Barber <gjb@FreeBSD.org>2021-05-12 14:29:53 +0000
commitfb6e261c20ebcd94875d623e167369802721f2dd (patch)
tree61ef9c8c1f3f57fadbba32e8e29b0698ef757818 /release
parent3f25cfea55922780fe47eb6ebcef49ca15297261 (diff)
downloadsrc-fb6e261c20ebcd94875d623e167369802721f2dd.tar.gz
src-fb6e261c20ebcd94875d623e167369802721f2dd.zip
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")
Diffstat (limited to 'release')
-rwxr-xr-xrelease/release.sh12
1 files changed, 2 insertions, 10 deletions
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