Date: Wed, 12 May 2021 15:51:03 GMT From: Glen Barber <gjb@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 41f27ff22956 - stable/12 - release: fix logic for ports update/checkout if the directory exists Message-ID: <202105121551.14CFp3Hq032577@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/12 has been updated by gjb: URL: https://cgit.FreeBSD.org/src/commit/?id=41f27ff229564baab3f1c92be6222ea52fb0417d commit 41f27ff229564baab3f1c92be6222ea52fb0417d Author: Glen Barber <gjb@FreeBSD.org> AuthorDate: 2021-05-12 15:29:54 +0000 Commit: Glen Barber <gjb@FreeBSD.org> CommitDate: 2021-05-12 15:29:54 +0000 release: fix logic for ports update/checkout if the directory exists This is a direct commit to stable/12. Sponsored by: Rubicon Communications, LLC ("Netgate") --- release/release.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/release/release.sh b/release/release.sh index 9ea6c5ee2cae..7326157a8562 100755 --- a/release/release.sh +++ b/release/release.sh @@ -221,7 +221,11 @@ chroot_setup() { ${VCSCMD} ${FORCE_SRC_KEY} ${SRCBRANCH} ${CHROOTDIR}/usr/src fi if [ -z "${NOPORTS}" ] && [ -z "${PORTS_UPDATE_SKIP}" ]; then - git -C ${CHROOTDIR}/usr/ports -b ${PORTBRANCH} clone + if [ -d "${CHROOTDIR}/usr/ports/.git" ]; then + git -C ${CHROOTDIR}/usr/ports pull -q + else + git -C ${CHROOTDIR}/usr/ports -b ${PORTBRANCH} clone + fi fi if [ -z "${CHROOTBUILD_SKIP}" ]; then
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202105121551.14CFp3Hq032577>