The branch main has been updated by np:
URL:
https://cgit.FreeBSD.org/src/commit/?id=aee4c9c5b88adc899b2e155a1c144acf96719f1e
commit aee4c9c5b88adc899b2e155a1c144acf96719f1e
Author: Navdeep Parhar <n...@freebsd.org>
AuthorDate: 2024-06-20 19:15:12 +0000
Commit: Navdeep Parhar <n...@freebsd.org>
CommitDate: 2024-06-20 19:17:46 +0000
Makefile.inc1: Fix typo affecting incremental pkgbase builds.
Fixes: 4231a5e50404 release: don't keep old packages if the BRANCH changes
Sponsored by: Chelsio Communications
---
Makefile.inc1 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile.inc1 b/Makefile.inc1
index 91d59e57b396..2f442bc9a394 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -2068,7 +2068,7 @@ real-update-packages: stage-packages .PHONY
continue; \
fi ; \
newsum=$$(pkg query -F
${REPODIR}/${PKG_ABI}/${PKG_VERSION}/$${newpkgname} '%X') ; \
- if [ "${BRANCH_EXT_FROM}" == "${BRANCH_EXT}" -a $${oldsum}" ==
"$${newsum}" ]; then \
+ if [ "${BRANCH_EXT_FROM}" == "${BRANCH_EXT}" -a "$${oldsum}" ==
"$${newsum}" ]; then \
echo "==> Keeping old
${PKG_NAME_PREFIX}-$${pkgname}-${PKG_VERSION_FROM}.${PKG_EXT}" ; \
rm ${REPODIR}/${PKG_ABI}/${PKG_VERSION}/$${newpkgname} ; \
cp $${pkg} ${REPODIR}/${PKG_ABI}/${PKG_VERSION} ; \
