From nobody Mon Jan 10 23:06:23 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 024BD1947887; Mon, 10 Jan 2022 23:06:26 +0000 (UTC) (envelope-from se@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JXqFY56Bjz4rhQ; Mon, 10 Jan 2022 23:06:25 +0000 (UTC) (envelope-from se@FreeBSD.org) Received: from [IPV6:2003:cd:5f26:900:c492:67dd:8868:a80d] (p200300cd5f260900c49267dd8868a80d.dip0.t-ipconnect.de [IPv6:2003:cd:5f26:900:c492:67dd:8868:a80d]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) (Authenticated sender: se/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id EDDF72D89E; Mon, 10 Jan 2022 23:06:24 +0000 (UTC) (envelope-from se@FreeBSD.org) Message-ID: <681cf997-4065-ff1b-f55f-c06c82a17ca2@FreeBSD.org> Date: Tue, 11 Jan 2022 00:06:23 +0100 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 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:91.0) Gecko/20100101 Thunderbird/91.4.1 Subject: Re: git: bcaf25a8c804 - main - Fix CONFLICTS entries of multiple ports Content-Language: en-US To: Brooks Davis Cc: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org References: <202201101516.20AFGNau035475@gitrepo.freebsd.org> <20220110221031.GA98055@spindle.one-eyed-alien.net> From: Stefan Esser In-Reply-To: <20220110221031.GA98055@spindle.one-eyed-alien.net> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="------------QveJN6ZFaOKKItl6wo2XfB9U" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641855985; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=RgDxRufu7Ak5N7+U0hLimyaae2c8hS5XOQD+moOif1o=; b=p63vnviKR0DPoYPCvXcKQB/93YxYWCXaRDQtQwts6LpFyIGFlLFEzlwqF0tNOHLAlfNhGU ymKhFw8XawPXwK02Op17SmtfdL2+g+H6cS8rQIQ40tVe4Bacs4va3IEhYxIv1lApO3P7Bb kb596WF6wSw/jBxj15IApYZbaMFVoj5IK0tFgKy00Nu2nZZpVnNG6PevboVpNgCBvF7Hpu DrAZzFoRvg1S6+zncjTb4IDLvgnGCeDNwOm9yOm5DBK+Cpz5/7NegmVpu3OY540K34TZSp 8Lh0Qr7qU3/MUSncOIVINW861mn52XXIbAGwekPbpGUzawrmz4e7y7tuB75f8Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641855985; a=rsa-sha256; cv=none; b=eeOnC2o6y17NaDYoSUUlHWSZaOjaipTBLyDDgHvy/ZFvysoy5bsXiUk2JqR6SWybCXLjnK SdCEJ4/cSKCux0V5yKCU+fiGFylZX3gUArg0Oqr1riOcs8ABfaMtDtaAM0FKgfZE34T4N1 EtmV5nqQGILeZlzHKaVdgkBtW7pBKudZ7XW53Zxspb62wzbJktwYF4xrTmnsl8D3qSgB+b /rlTdOLRylrXNBd/HHZfzZx68fZ1QtB9HvLgl1hTCvYGPQAd5Sd7TUF5StDLR46ti/qv/Z EMIjTMMcNPf6gJ1gIZ6UVkn/ZC0yx0fN3M0vvaPRc5AvChythCgPAtCWgW/lDA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --------------QveJN6ZFaOKKItl6wo2XfB9U Content-Type: multipart/mixed; boundary="------------L0vOgEvwAf2QMN2wWj06QYpA"; protected-headers="v1" From: Stefan Esser To: Brooks Davis Cc: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Message-ID: <681cf997-4065-ff1b-f55f-c06c82a17ca2@FreeBSD.org> Subject: Re: git: bcaf25a8c804 - main - Fix CONFLICTS entries of multiple ports References: <202201101516.20AFGNau035475@gitrepo.freebsd.org> <20220110221031.GA98055@spindle.one-eyed-alien.net> In-Reply-To: <20220110221031.GA98055@spindle.one-eyed-alien.net> --------------L0vOgEvwAf2QMN2wWj06QYpA Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable >Am 10.01.22 um 23:10 schrieb Brooks Davis: > On Mon, Jan 10, 2022 at 03:16:23PM +0000, Stefan Esser wrote: >> The branch main has been updated by se: [...] > The devel/llvm-devel port change (truncated in the email) contains: >=20 > +CONFLICTS_INSTALL=3D llvm-devel >=20 > This confuses me. Why are we adding a self-conflict? This line is actually incomplete, I'll fix it. It should read: CONFLICTS_INSTALL=3D llvm-devel llvm-devel-lite There are 2 flavors, and the resulting packages contain identically named files. But due to the "same origin exclusion" no conflict will be detected, anyway, until my review D31151 https://reviews.freebsd.org/D31151 is finally reviewed and hopefully accepted. It fixes a feature from the time when different flavors could result in identical package base names (e.g. a py- prefix and not py38- as has long been enforced for all flavored ports). Currently flavors between different flavors are defined with much effort (see the devel/git example in D31151), but completely useless, since they are then ignored. With D31151 the 2 flavors of this port would correctly be detected as conflicting with each other, and that is important if such a port is used as a dependency. See PR 250335 for an issue this causes: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D250335 Here the dependency on git-lite in one port with git already installed caused an attempt to install git-lite, too, with the conflict only being detected at install time. The conflicts check in the ports framework ignored this conflict despite the CONFLICTS entry, since both git and git-lite share the same origin. Regards, STefan --------------L0vOgEvwAf2QMN2wWj06QYpA-- --------------QveJN6ZFaOKKItl6wo2XfB9U Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wsB5BAABCAAjFiEEo3HqZZwL7MgrcVMTR+u171r99UQFAmHcu+8FAwAAAAAACgkQR+u171r99UR0 wAf+I0b0s3wUg/nP0kU3MnpvEd9w9xsuilWPJ6N3VxRm5/f1YO3VSgJGRVF7bKQUyi3sDMWn8l6Z 7vNzZ/swweGuRXqFe/Syeu1mEw7SaMDiclYiKUKTZ4JNGQRCJggBRFqcG2iAt1sQjSbPSm5CgHOU CvulE7gJvFyBqRdCA3e2tB/HWyaMfMxV4vy3pk+V289RGqH5HG2OWQiYg9GpFE8iT9nTp6bNu27w wt6qH90NQzIV/+3FJW8mVTi25wzI2JfAfl4pZmTMQe+QE/UWSqXDwXyJpIuxMnL5TS5Ylf1Fhf4y WDxYm6xuyGEs1tioI3L8zaFT8ZEtu0ffpUG+TcpfdA== =I5gc -----END PGP SIGNATURE----- --------------QveJN6ZFaOKKItl6wo2XfB9U--