pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/pkgtools/pkglint/files Removed the check for contiguou...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/b25ab510976d
branches:  trunk
changeset: 498519:b25ab510976d
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Wed Aug 24 17:29:52 2005 +0000

description:
Removed the check for contiguous blank lines completely. As long as
pkglint does not catch the important facts correctly it shouldn't be
nitpicking about white-space. I doubt that anyone has used the -B# and
the -Wwhitespace options at all, so there's no harm removing them.

diffstat:

 pkgtools/pkglint/files/pkglint.pl |  12 +-----------
 1 files changed, 1 insertions(+), 11 deletions(-)

diffs (64 lines):

diff -r 1bd10a8217ab -r b25ab510976d pkgtools/pkglint/files/pkglint.pl
--- a/pkgtools/pkglint/files/pkglint.pl Wed Aug 24 16:50:13 2005 +0000
+++ b/pkgtools/pkglint/files/pkglint.pl Wed Aug 24 17:29:52 2005 +0000
@@ -11,7 +11,7 @@
 # Freely redistributable.  Absolutely no warranty.
 #
 # From Id: portlint.pl,v 1.64 1998/02/28 02:34:05 itojun Exp
-# $NetBSD: pkglint.pl,v 1.256 2005/08/24 16:50:13 rillig Exp $
+# $NetBSD: pkglint.pl,v 1.257 2005/08/24 17:29:52 rillig Exp $
 #
 # This version contains lots of changes necessary for NetBSD packages
 # done by:
@@ -302,7 +302,6 @@
 
 # Command Line Options
 my $opt_autofix                = false;
-my $opt_contblank      = 1;
 my $opt_debug          = false;
 my $opt_dumpmakefile   = false;
 my $opt_quiet          = false;
@@ -349,7 +348,6 @@
 my $opt_warn_plist_sort        = false;
 my $opt_warn_types     = true;
 my $opt_warn_vague     = false;
-my $opt_warn_whitespace        = false;
 my $opt_warn_workdir   = true;
 my (%warnings) = (
        "absname"       => [\$opt_warn_absname, "warn about use of absolute file names"],
@@ -361,7 +359,6 @@
        "plist-sort"    => [\$opt_warn_plist_sort, "warn about unsorted entries in PLISTs"],
        "types"         => [\$opt_warn_types, "do some simple type checking in Makefiles"],
        "vague"         => [\$opt_warn_vague, "show old (unreliable, vague) warnings"],
-       "whitespace"    => [\$opt_warn_whitespace, "warn about white-space issues"],
        "workdir"       => [\$opt_warn_workdir, "warn that work* should not be committed into CVS"],
 );
 
@@ -472,7 +469,6 @@
                        my ($opt, $val) = @_;
                        parse_multioption($val, \%checks);
                },
-               "contblank|B=i" => \$opt_contblank,
                "debug|d" => \$opt_debug,
                "dumpmakefile|I" => \$opt_dumpmakefile,
                "gcc-output-format|g" => sub {
@@ -1288,7 +1284,6 @@
 
 sub checklines_Makefile($) {
        my ($lines) = @_;
-       my ($cont) = 0;
 
        foreach my $line (@{$lines}) {
                my $text = $line->text;
@@ -1303,11 +1298,6 @@
                        $line->log_warning("Use tab (not spaces) to make indentation.");
                }
 
-               $cont = ($text eq "") ? $cont + 1 : 0;
-               if ($opt_warn_whitespace && $cont == $opt_contblank + 1) {
-                       $line->log_warning("${cont} contiguous blank lines, should be at most ${opt_contblank}.");
-               }
-
                if ($text =~ $regex_varassign) {
                        my ($varname, $op, $value) = ($1, $2, $3);
 



Home | Main Index | Thread Index | Old Index