From 5606d3f1b5b0075c725b46e2bce8cd95b2c3b405 Mon Sep 17 00:00:00 2001 From: Joe Marcus Clarke Date: Sat, 12 May 2018 22:14:30 +0000 Subject: Bump version to 2.18.2. Fix a regression in the mae makepatch check. Make sure only the patch header is checked, but make sure to read in the entire patch file. This regression was introduced in 2.18.0. PR: 228203 --- ports-mgmt/portlint/src/portlint.pl | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'ports-mgmt/portlint/src') diff --git a/ports-mgmt/portlint/src/portlint.pl b/ports-mgmt/portlint/src/portlint.pl index 7d5dd07dad4f..9c55d01fa1e3 100644 --- a/ports-mgmt/portlint/src/portlint.pl +++ b/ports-mgmt/portlint/src/portlint.pl @@ -15,7 +15,7 @@ # was removed. # # $FreeBSD$ -# $MCom: portlint/portlint.pl,v 1.461 2018/05/12 18:55:45 jclarke Exp $ +# $MCom: portlint/portlint.pl,v 1.463 2018/05/12 22:12:18 jclarke Exp $ # use strict; @@ -50,7 +50,7 @@ $portdir = '.'; # version variables my $major = 2; my $minor = 18; -my $micro = 1; +my $micro = 2; # default setting - for FreeBSD my $portsdir = '/usr/ports'; @@ -1037,16 +1037,17 @@ sub checkpatch { open(IN, "< $file") || return 0; $whole = ''; + my $checked_header = 0; while () { $whole .= $_; - if (/^--- /) { + if (/^--- / && !$checked_header) { + $checked_header = 1; if ($_ !~ /UTC\s*$/) { &perror("WARN", $file, -1, "patch was not generated using ". "``make makepatch''. It is recommended to use ". "``make makepatch'' when you need to [re-]generate a ". "patch to ensure proper patch format."); } - # last; } } -- cgit v1.2.3