lintian: r1063 - in trunk: checks debian frontend testset testset/manpages/debian

[rra@debian.org]

Author: rra
Date: 2007-12-08 01:39:03 +0100 (Sat, 08 Dec 2007)
New Revision: 1063

Modified:
   trunk/checks/lintian.desc
   trunk/debian/changelog
   trunk/frontend/lintian
   trunk/testset/manpages/debian/overrides
   trunk/testset/tags.manpages
Log:
  + [RA] Fix the malformed-override long description.  Thanks, Stefan
    Fritsch.
  + [RA] Skip check and collection *.desc files whose names start with a
    period (mostly to avoid testing artifacts from editor lock files).
  + [RA] Restore previous override parsing and make the package name
    optional again.  Thanks, Stefan Fritsch.  (Closes: #454790)
  + [RA] Check overrides for implausible tags.

Modified: trunk/checks/lintian.desc
===================================================================
--- trunk/checks/lintian.desc	2007-12-08 00:07:14 UTC (rev 1062)
+++ trunk/checks/lintian.desc	2007-12-08 00:39:03 UTC (rev 1063)
@@ -68,7 +68,7 @@
 Info: Lintian discovered an override entry with an invalid format.  An
  override entry should have the format:
  .
-   <package>[ <type>]: <tag>[ <extra> ...]
+   &lt;package&gt;[ &lt;type&gt;]: &lt;tag&gt;[ &lt;extra&gt; ...]
  .
  where <package> is the package name, the optional <type> parameter
  specifies the package type (binary is the default), <tag> is the tag to

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2007-12-08 00:07:14 UTC (rev 1062)
+++ trunk/debian/changelog	2007-12-08 00:39:03 UTC (rev 1063)
@@ -21,6 +21,8 @@
   * checks/lintian.desc:
     + [RA] Add bad-ubuntu-distribution-in-changes-file, merged from the
       Ubuntu patch.
+    + [RA] Fix the malformed-override long description.  Thanks, Stefan
+      Fritsch.
   * checks/nmu:
     + [RA] No packages with ubuntu in the version number are NMUs.  Merged
       from the Ubuntu patch.
@@ -32,8 +34,13 @@
     + [RA] If the version number indicates an Ubuntu package, check
       against a different list of allowable distributions.  Merged from
       the Ubuntu patch.
+    + [RA] Skip check and collection *.desc files whose names start with a
+      period (mostly to avoid testing artifacts from editor lock files).
+    + [RA] Restore previous override parsing and make the package name
+      optional again.  Thanks, Stefan Fritsch.  (Closes: #454790)
+    + [RA] Check overrides for implausible tags.
 
- -- Russ Allbery <rra@debian.org>  Fri, 07 Dec 2007 16:02:27 -0800
+ -- Russ Allbery <rra@debian.org>  Fri, 07 Dec 2007 16:22:42 -0800
 
 lintian (1.23.38) unstable; urgency=low
 

Modified: trunk/frontend/lintian
===================================================================
--- trunk/frontend/lintian	2007-12-08 00:07:14 UTC (rev 1062)
+++ trunk/frontend/lintian	2007-12-08 00:39:03 UTC (rev 1063)
@@ -850,6 +850,7 @@
     or fail("cannot read directory $LINTIAN_ROOT/collection");
 
 for my $f (readdir COLLDIR) {
+    next if $f =~ /^\./;
     next unless $f =~ /\.desc$/;
 
     print "N: Reading collector description file $f ...\n" if $debug >= 2;
@@ -938,6 +939,7 @@
     or fail("cannot read directory $LINTIAN_ROOT/checks");
 
 for my $f (readdir CHECKDIR) {
+    next if $f =~ /^\./;
     next unless $f =~ /\.desc$/;
     print "N: Reading checker description file $f ...\n" if $debug >= 2;
 
@@ -1286,12 +1288,12 @@
                     s/^\s+//o;
                     s/\s+$//o;
                     s/\s+/ /go;
-
-                    if (s/^\Q$pkg\E( \Q$long_type\E)?: //) {
-                        next if $_ eq '';
-                        Tags::add_override($_);
+                    my $override = $_;
+                    $override =~ s/^\Q$pkg\E( \Q$long_type\E)?: //;
+                    if ($override eq '' or $override !~ /^[a-z0-9-]+(\s+.*)?$/) {
+                        tag ('malformed-override', $override);
                     } else {
-                        tag ('malformed-override', $_);
+                        Tags::add_override($override);
                     }
                 }
                 close(O);

Modified: trunk/testset/manpages/debian/overrides
===================================================================
--- trunk/testset/manpages/debian/overrides	2007-12-08 00:07:14 UTC (rev 1062)
+++ trunk/testset/manpages/debian/overrides	2007-12-08 00:39:03 UTC (rev 1063)
@@ -1,8 +1,9 @@
    manpages:	no-copyright-file    
-manpages: foo-tag-that-does-not-exist
+foo-tag-that-does-not-exist
 # this is a valid comment
 
 
    
 #and some empty lines
-but-this-is-just-broken
+but_this_is_just_broken
+manpages:

Modified: trunk/testset/tags.manpages
===================================================================
--- trunk/testset/tags.manpages	2007-12-08 00:07:14 UTC (rev 1062)
+++ trunk/testset/tags.manpages	2007-12-08 00:39:03 UTC (rev 1063)
@@ -10,7 +10,8 @@
 E: manpages: info-document-not-compressed usr/share/info/broken
 E: manpages: info-document-not-compressed-with-gzip usr/share/info/baz.broken.gz
 E: manpages: info-document-not-compressed-with-max-compression usr/share/info/bar.gz
-E: manpages: malformed-override but-this-is-just-broken
+E: manpages: malformed-override but_this_is_just_broken
+E: manpages: malformed-override manpages:
 E: manpages: manpage-has-wrong-extension usr/X11R6/man/man6/X11R6-binary.man
 E: manpages: manpage-is-dh_make-template usr/share/man/man1/program.1.gz
 E: manpages: manpage-not-compressed usr/X11R6/man/man6/X11R6-binary.man