Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 22 May 2018 15:52:31 +0200
From:      Mathieu Arnold <mat@FreeBSD.org>
To:        Joe Marcus Clarke <marcus@freebsd.org>
Cc:        Mathieu Arnold <mat@FreeBSD.org>, 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:  <20180522135231.bdudnyrreswcumwe@ogg.in.absolight.net>
In-Reply-To: <333774c1-c120-2582-9a60-1b1c784cdd5b@freebsd.org>
References:  <201805121859.w4CIx8jx035047@repo.freebsd.org> <20180515140351.oyfapiqygprxomvq@ogg.in.absolight.net> <333774c1-c120-2582-9a60-1b1c784cdd5b@freebsd.org>

next in thread | previous in thread | raw e-mail | index | archive | help

--4hqhdc45c3ighh3m
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Mon, May 21, 2018 at 11:57:36AM -0400, Joe Marcus Clarke wrote:
> 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
>=20
> Does this look right:

Mmmm, I think it does, yes.  Though the check is probably wrong, it
should probably not be looking for /^py-/ in the second field, but for
${PYTHON_PKGNAMEPREFIX} in the first field.

> 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}");
>  				}
>  			}
=20




--=20
Mathieu Arnold

--4hqhdc45c3ighh3m
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2

iQJ8BAABCgBmBQJbBCCfXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzQUI2OTc4OUQyRUQxMjEwNjQ0MEJBNUIz
QTQ1MTZGMzUxODNDRTQ4AAoJEDpFFvNRg85IPksP/iTbQJiHxGZwB0p7nS3WTUaq
JX+OobHxNDV93tu3Lx0bGMHnKXmpR1fuKnyedOyjucBPmA4PUP76BdeeMo3+Dbjp
LZIo1lQNtZQdeSnEA5zvQsp9bYkXXPjHIKfRiSI6YOIzTUJo1uqACssldckP+X/9
oxSK38kFgt4pMYB4ALYILfjh8aGFoq/x4XN27yMwD0QWOa6Ngi/b7qUuoyiPUx2+
iTTR5wcp6WgjXtfQxI7DVwhDsvpZhg+2JtWFIkYnZD+msTgL3bnWIrVE2zZjeE6y
IwpqVoAJH9/nno56xvCsxl8t2YohG/Y/zW/PTV0WsuTUQ4G3SKc4hWpcogzFlxx9
RMswjnpTfx38MZB8sQf1n1fgfTbimK/kpMjPTtV9BMvv40EmNvdubVlfiF562G2e
/Jij/XLzCzaodQ2Z9fjSQUaYxQaV0mNWqK1n54ifp4WmPpahttkRuEw294fqwWFH
98Gg9qwbHJLVaqrmMyjh3z3viIEXYGwMUmAAvLlLbBpB38oCKay6wTQnBkhK3Q4U
XxqYayhKYJBIbcdAIrDbzr8sTBuLkykKcgNfsH/XQDVwyM4db51FS1ARkDDL2vPb
bvBT/XRQdwB+Wl8E/aexT9wlEeNU2AiFRLZ568GO6cgNqmgQnx6HWGlUpZMBc69T
C5uEVpgezHVcPal83Avg
=MCoB
-----END PGP SIGNATURE-----

--4hqhdc45c3ighh3m--



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20180522135231.bdudnyrreswcumwe>