Date: Fri, 26 Aug 2022 09:04:00 GMT From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: acf5d2725a4e - main - CONFLICTS_INSTALL: check later for conflicts Message-ID: <202208260904.27Q940Oq049725@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/ports/commit/?id=acf5d2725a4e221a2aceb44297e151dc3902735d commit acf5d2725a4e221a2aceb44297e151dc3902735d Author: Baptiste Daroussin <bapt@FreeBSD.org> AuthorDate: 2022-08-26 08:52:51 +0000 Commit: Baptiste Daroussin <bapt@FreeBSD.org> CommitDate: 2022-08-26 09:03:31 +0000 CONFLICTS_INSTALL: check later for conflicts Until now, the check of the CONFLICTS_INSTALL was done during the sanity check, meaning very early in the package building process. this makes it painful in 2 cases: 1. a port depend at build time on the extraction of this port, it will print its warning message along with the default timer, while we will never reach the said conflict at all. 2. since the ports tree has been staged, one can even go up to create a valid package even if a locally conflicting package is locally installed. This change make the check and print of the conflicts only happen during the install phase, the same way the ports tree checks if a previous version is already installed. PR: 213890 Discussed with: tcberner Reviewed by: tcberner Differential Revision: https://reviews.freebsd.org/D36355 --- Mk/bsd.port.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 0ded60991a2f..9fbf900609d2 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -5233,7 +5233,7 @@ _SANITY_SEQ= 050:post-chroot 100:pre-everything \ 210:show-dev-errors 220:show-dev-warnings \ 250:check-categories 300:check-makevars \ 350:check-desktop-entries 400:check-depends \ - 450:identify-install-conflicts 500:check-deprecated \ + 500:check-deprecated \ 550:check-vulnerable 600:check-license 650:check-config \ 700:buildanyway-message 750:options-message ${_USES_sanity} @@ -5293,6 +5293,7 @@ _TEST_SEQ= 100:test-message 150:test-depends 300:pre-test 500:do-test \ ${_OPTIONS_test} ${_USES_test} _INSTALL_DEP= stage _INSTALL_SEQ= 100:install-message \ + 150:identify-install-conflicts \ 200:check-already-installed \ 300:create-manifest _INSTALL_SUSEQ= 400:fake-pkg 500:security-check
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202208260904.27Q940Oq049725>