diff options
| author | Glen Barber <gjb@FreeBSD.org> | 2021-05-12 14:29:53 +0000 |
|---|---|---|
| committer | Glen Barber <gjb@FreeBSD.org> | 2021-05-12 15:52:23 +0000 |
| commit | 929bf5b637c3cfdfdabdd2fbf95e786fd7e64141 (patch) | |
| tree | 4ac3362c62f4f7beb3083de35df87739f08575b9 | |
| parent | 18fe4221391f78bb91bb172c6d2cb2e0ef27cfef (diff) | |
release: follow-up to previous commit to use Git for the ports tree
Approved by: re (delphij, insta-MFC)
Sponsored by: Rubicon Communications, LLC ("Netgate")
(cherry picked from commit fb6e261c20ebcd94875d623e167369802721f2dd)
| -rwxr-xr-x | release/release.sh | 12 |
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 |