Date: Tue, 12 Dec 2000 23:15:56 +0200 From: Peter Pentchev <roam@orbitel.bg> To: Akinori MUSHA <knu@iDaemons.org> Cc: mharo@FreeBSD.org, ports@FreeBSD.org Subject: Re: portlint - minor patches Message-ID: <20001212231556.A390@ringworld.oblivion.bg> In-Reply-To: <867l55wdjq.wl@archon.local.idaemons.org>; from knu@iDaemons.org on Wed, Dec 13, 2000 at 06:11:05AM %2B0900 References: <20001212174943.C36405@ringworld.oblivion.bg> <868zplwe1b.wl@archon.local.idaemons.org> <867l55wdjq.wl@archon.local.idaemons.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Wed, Dec 13, 2000 at 06:11:05AM +0900, Akinori MUSHA wrote:
> At Wed, 13 Dec 2000 06:00:32 +0900,
> I wrote:
> > > Then, there's the other thing - when checking for contiguous blank
> > > lines, portlint makes an additional effort to not check patchfiles -
> > > it is legitimate for a patch to end with one or more blank lines of
> > > context. However, the check is slightly broken - it assumes that
> > > filenames are taken relative to the port's directory, while now filenames
> > > are absolute. Thus, the /^files\/patch-/ match fails, and patchfiles
> > > are also checked for blank lines at the end.
> >
> > I drastically changed that part to check more effectively and strictly
>
> Bah, it's not the part you mentioned, but the part after that.. I
> must need some sleep. ;) Anyway, I fixed it in the better way.
>
> Thanks for catching it, and for indirectly inciting me to improve the
> part nearby. :>
Thanks for taking the time to examine my patches :) And while you're
at it, here's something else I've had in my local patches for quite some
time - a -q option to portlint to make it really quiet, not outputting
any OK messages, only warnings and errors (and now I guess it's time
for me to go catch some sleep, or the next run-on sentence I write
might *really* drive me crazy ;)
G'luck,
Peter
--
This sentence no verb.
Index: portlint.pl
===================================================================
RCS file: /home/ncvs/ports/devel/portlint/src/portlint.pl,v
retrieving revision 1.24
diff -u -r1.24 portlint.pl
--- portlint.pl 2000/12/12 14:24:12 1.24
+++ portlint.pl 2000/12/12 21:10:12
@@ -20,19 +20,19 @@
# $Id: portlint.pl,v 1.28.2.1 2000/04/24 02:12:36 mharo Exp $
#
-use vars qw/ $opt_a $opt_b $opt_c $opt_h $opt_t $opt_v $opt_M $opt_N $opt_B $opt_V /;
+use vars qw/ $opt_a $opt_b $opt_c $opt_h $opt_q $opt_t $opt_v $opt_M $opt_N $opt_B $opt_V /;
use Getopt::Std;
use IPC::Open2;
#use strict;
my ($err, $warn);
-my ($extrafile, $parenwarn, $committer, $verbose, $usetabs, $newport);
+my ($extrafile, $parenwarn, $committer, $quiet, $verbose, $usetabs, $newport);
my $contblank;
my $portdir;
my $makeenv;
$err = $warn = 0;
-$extrafile = $parenwarn = $committer = $verbose = $usetabs = $newport = 0;
+$extrafile = $parenwarn = $committer = $quiet = $verbose = $usetabs = $newport = 0;
$contblank = 1;
$portdir = '.';
@@ -82,6 +82,7 @@
-a additional check for scripts/* and pkg-*
-b warn \$(VARIABLE)
-c committer mode
+ -q quiet mode
-v verbose mode
-t nit pick about use of spaces
-M set make variables (ex. PORTSDIR=/usr/ports.work)
@@ -97,13 +98,14 @@
}
-getopts('abchtvBM:N:V');
+getopts('abchqtvBM:N:V');
&usage if $opt_h;
&version if $opt_V;
$extrafile = 1 if $opt_a;
$parenwarn = 1 if $opt_b;
$committer = 1 if $opt_c;
+$quiet = 1 if $opt_q;
$verbose = 1 if $opt_v;
$newport = 1 if $opt_N;
$usetabs = 1 if $opt_t;
@@ -268,7 +270,7 @@
$checker{$i} = 'checkpatch';
}
foreach my $i (@checker) {
- print "OK: checking $i.\n";
+ print "OK: checking $i.\n" if ($verbose || !$quiet);
if (! -f "$i") {
&perror("FATAL: no $i in \"$portdir\".") unless $i eq $makevar{MD5_FILE} && $makevar{DISTFILES} eq "";
} else {
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20001212231556.A390>