From nobody Fri Aug 26 09:04:00 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MDYmJ2RF0z4ZfF8; Fri, 26 Aug 2022 09:04:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MDYmJ1tjCz3nXj; Fri, 26 Aug 2022 09:04:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661504640; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+tTroMksQrt4B+7Kr3rMH7yhTMsxoEc56QcE3STrNaE=; b=Aqgz+2AbVS0UzuIuMCgFtSQEKbg6nnR0N4mlrzxqMcJY7q7CQizOawuXl6EoSvsv2KhWc7 D+gDep+T04dws9I3ALIx3I5xo1mJ+3IX1TdX0v/cV7PTeWFCgI4UIw8jW3pqL//WQ14QWr AMIbN+TxbmZ+kjzfMEC2lRLZ4Rt4exJx5jYXpZS0Cq4VHWL+9JwBe2KFjSu9sWLcAfxZy9 87Ns4V7KKGfoqMUtIAs2xUkW8Zm77oXi00e/PqhxjRhCrWREUJ+8jezOiGNzlugF05q/Xz /uZt4kLm5jFLwtEV3xKBye33gr9Mr8xtPmOeGS+maC0q+1rg/3kBHFTWCQ2heg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MDYmJ0zZSzM2L; Fri, 26 Aug 2022 09:04:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 27Q940xG049726; Fri, 26 Aug 2022 09:04:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27Q940Oq049725; Fri, 26 Aug 2022 09:04:00 GMT (envelope-from git) Date: Fri, 26 Aug 2022 09:04:00 GMT Message-Id: <202208260904.27Q940Oq049725@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Baptiste Daroussin Subject: git: acf5d2725a4e - main - CONFLICTS_INSTALL: check later for conflicts List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: acf5d2725a4e221a2aceb44297e151dc3902735d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661504640; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+tTroMksQrt4B+7Kr3rMH7yhTMsxoEc56QcE3STrNaE=; b=GhdGYAgmJ5T/ncUgRwThCWn7SP0o/Tnos0DHavT88Rq06jEzOEXvkXxS5IJYPdttR2uJPD kz4NcD0lfjON5nw4UKMroa6/oas3rCmyeVyVf3+Dywx7dtaOMnTvF8zLaXH5FizlDXFuso N7Deab7Tb4Ub8mqh2z7+bR6XcGrypB0BV8NXYKb/goMc37hjTX60hFogwGl6u6J+CeukQL 83RC8qqlmRG9S7u0vKPT25J8GGPZzWlTGLp9QsmQZNdehZ9TmAYISfi5p8OzV5y3Rylvlh WelooVb6aTtS0Q0s1+ARj9VUPBGsfzOKhYUswaXkbEq58P07vVWbmnHMzSzWGA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1661504640; a=rsa-sha256; cv=none; b=tamdLxqkrpFbY+8vNIOMSG2NhJ19sce7qTpURs/hxWMV4WDZN6tze/Er1YEVUfkdVQ83fi E4qrN1wZdst5avvXefyJZSM+aTaQ73exlarSQItxsT8oDll7AWDJ23fepKuhyYvMJDLrzD xOwoQOrMmqboq1hCFJdSnWvO3Ju4AXu0jVmPtkltE4yEasl9XG4ATmek0utmxvjrKHHmZU CEEgP/+PxXTeUrQQiIVj/rrNPa8HiKRSsIDH8+e6BXapFSzQrvYyb12+qwDFusp1H3M7rw FEnecaT6CH9BydwmSsHCY0AzFv6I6ZVjA/kkwsaOrpyZEjhjlkfFE548xT4sEA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/ports/commit/?id=acf5d2725a4e221a2aceb44297e151dc3902735d commit acf5d2725a4e221a2aceb44297e151dc3902735d Author: Baptiste Daroussin AuthorDate: 2022-08-26 08:52:51 +0000 Commit: Baptiste Daroussin 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