Date: Mon, 21 May 2018 11:57:36 -0400 From: Joe Marcus Clarke <marcus@freebsd.org> To: Mathieu Arnold <mat@FreeBSD.org> Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r469754 - in head/ports-mgmt/portlint: . src Message-ID: <333774c1-c120-2582-9a60-1b1c784cdd5b@freebsd.org> In-Reply-To: <20180515140351.oyfapiqygprxomvq@ogg.in.absolight.net> References: <201805121859.w4CIx8jx035047@repo.freebsd.org> <20180515140351.oyfapiqygprxomvq@ogg.in.absolight.net>
next in thread | previous in thread | raw e-mail | index | archive | help
This is an OpenPGP/MIME signed message (RFC 4880 and 3156)
--5QMqpgvAr1eV0Q6ADeVKU0zOyW6JxKFCQ
Content-Type: multipart/mixed; boundary="PtdV5M5O1tyHVERCbZCcdUhb2Fao5iIH9";
protected-headers="v1"
From: Joe Marcus Clarke <marcus@freebsd.org>
To: Mathieu Arnold <mat@FreeBSD.org>
Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
svn-ports-head@freebsd.org
Message-ID: <333774c1-c120-2582-9a60-1b1c784cdd5b@freebsd.org>
Subject: Re: svn commit: r469754 - in head/ports-mgmt/portlint: . src
References: <201805121859.w4CIx8jx035047@repo.freebsd.org>
<20180515140351.oyfapiqygprxomvq@ogg.in.absolight.net>
In-Reply-To: <20180515140351.oyfapiqygprxomvq@ogg.in.absolight.net>
--PtdV5M5O1tyHVERCbZCcdUhb2Fao5iIH9
Content-Type: text/plain; charset=windows-1252
Content-Language: en-US
Content-Transfer-Encoding: quoted-printable
On 5/15/18 10:03, Mathieu Arnold wrote:
> On Sat, May 12, 2018 at 06:59:08PM +0000, Joe Marcus Clarke wrote:
>> if ($m{'fla'} ne '${PY_FLAVOR}') {
>> - &perror("FATAL", $file, -1, "directory for dependency ".
>> - "$m{'dep'} must be $m{'dir'}:\@\${PY_FLAVOR}");
>> + &perror("WARN", $file, -1, "you may want directory for ".
>> + "dependency $m{'dep'} to be $m{'dir'}:\@\${PY_FLAVOR}");
>> }
>> } else {
>> if ($m{'fla'} ne '${FLAVOR}') {
>> - &perror("FATAL", $file, -1, "directory for dependency ".
>> - "$m{'dep'} must be $m{'dir'}:\@\${FLAVOR}");
>> + &perror("WARN", $file, -1, "you may want directory for ".
>> + "dependency $m{'dep'} to be $m{'dir'}:\@\${FLAVOR}");
>=20
> Could you please only tell people to use PY_FLAVOR? Using FLAVOR
> directly dates back from when I was implementing the Python flavors and=
> is a bad idea.
>=20
Does this look right:
diff -u -r1.463 portlint.pl
--- portlint.pl 12 May 2018 22:12:18 -0000 1.463
+++ portlint.pl 21 May 2018 15:57:25 -0000
@@ -1149,18 +1149,9 @@
# check Python flavor
my $bdir =3D basename($m{'dir'});
if ($bdir =3D~ /^py-/) {
- if (!defined($makevar{USE_PYTHON}) ||
- $makevar{USE_PYTHON} eq 'noflavors' ||
- $makevar{USE_PYTHON} eq '') {
- if ($m{'fla'} ne '${PY_FLAVOR}') {
- &perror("WARN", $file, -1, "you may want directory for ".
- "dependency $m{'dep'} to be $m{'dir'}:\@\${PY_FLAVOR}");
- }
- } else {
- if ($m{'fla'} ne '${FLAVOR}') {
- &perror("WARN", $file, -1, "you may want directory for ".
- "dependency $m{'dep'} to be $m{'dir'}:\@\${FLAVOR}");
- }
+ if ($m{'fla'} ne '${PY_FLAVOR}') {
+ &perror("WARN", $file, -1, "you may want directory for ".
+ "dependency $m{'dep'} to be $m{'dir'}:\@\${PY_FLAVOR}");
}
}
Joe
--=20
Joe Marcus Clarke
FreeBSD GNOME Team :: gnome@FreeBSD.org
FreeNode / #freebsd-gnome
http://www.FreeBSD.org/gnome
--PtdV5M5O1tyHVERCbZCcdUhb2Fao5iIH9--
--5QMqpgvAr1eV0Q6ADeVKU0zOyW6JxKFCQ
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: OpenPGP digital signature
Content-Disposition: attachment; filename="signature.asc"
-----BEGIN PGP SIGNATURE-----
iF0EARECAB0WIQTMiWQHc8wChijkr7lvaI+K/hTPhwUCWwLscwAKCRBvaI+K/hTP
h9sBAJ90tX813P35z0oXYMuxYYj9ytE4owCgjGijg/iYyBGm/pnPI6e0bZILCfE=
=U2/J
-----END PGP SIGNATURE-----
--5QMqpgvAr1eV0Q6ADeVKU0zOyW6JxKFCQ--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?333774c1-c120-2582-9a60-1b1c784cdd5b>