svn commit: r469754 - in head/ports-mgmt/portlint: . src

[Mathieu Arnold]

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}");
> > 
> > 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.
> > 
> 
> 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 = basename($m{'dir'});
>  			if ($bdir =~ /^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}");
>  				}
>  			}
 




-- 
Mathieu Arnold
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 949 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/svn-ports-head/attachments/20180522/d3b36bbe/attachment.sig>