lintian: r700 - in trunk: debian lib

[rra@debian.org]

Author: rra
Date: 2006-07-15 08:43:16 +0200 (Sat, 15 Jul 2006)
New Revision: 700

Modified:
   trunk/debian/changelog
   trunk/lib/Tags.pm
Log:
    Thanks to Martin F. Krafft for the report.  (Closes: #370720)
* lib/Tags.pm:
  + [RA] If a tag has been overriden via any mechanism, do not add it to
    any of the statistics (tag, severity, or significance).  Before, the
    override only suppressed a record for the specific statistic the
    override was based on, meaning that classic tag-based overrides
    didn't suppress severity statistics.  Overridden error tags would
    therefore cause lintian to exit with non-zero status.  Thanks,
    Andree Leidenfrost and Martin F. Krafft.  (Closes: #377182, #374314)

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2006-07-15 05:35:58 UTC (rev 699)
+++ trunk/debian/changelog	2006-07-15 06:43:16 UTC (rev 700)
@@ -7,7 +7,7 @@
   * checks/fields{.desc,}:
     + [RA] Don't warn virtual-package-depends-without-real-package-depends
       for Recommends and rewrite the tag description to be more accurate.
-      Thanks to Martin Krafft for the report.  (Closes: #370720)
+      Thanks to Martin F. Krafft for the report.  (Closes: #370720)
   * checks/manpages{.desc,}:
     + [RA] Warn about manpage short descriptions of the form "manual page
       for program" (usually generated by help2man).
@@ -17,8 +17,17 @@
     + [RA] Warn if the changelog incorrectly indicates an NMU.  Thanks to
       George Danchev for the report.
 
- -- Russ Allbery <rra@debian.org>  Fri, 14 Jul 2006 22:34:10 -0700
+  * lib/Tags.pm:
+    + [RA] If a tag has been overriden via any mechanism, do not add it to
+      any of the statistics (tag, severity, or significance).  Before, the
+      override only suppressed a record for the specific statistic the
+      override was based on, meaning that classic tag-based overrides
+      didn't suppress severity statistics.  Overridden error tags would
+      therefore cause lintian to exit with non-zero status.  Thanks,
+      Andree Leidenfrost and Martin F. Krafft.  (Closes: #377182, #374314)
 
+ -- Russ Allbery <rra@debian.org>  Fri, 14 Jul 2006 23:41:45 -0700
+
 lintian (1.23.22) unstable; urgency=low
 
   * checks/debconf:

Modified: trunk/lib/Tags.pm
===================================================================
--- trunk/lib/Tags.pm	2006-07-15 05:35:58 UTC (rev 699)
+++ trunk/lib/Tags.pm	2006-07-15 06:43:16 UTC (rev 700)
@@ -236,7 +236,9 @@
 
     for my $k (qw( severity significance tag )) {
 	$stats{$current}{$k}{$tag_info->{$k}}++
-	    unless $tag_info->{overridden}{$k};
+	    unless $tag_info->{overridden}{override}
+		|| $tag_info->{overridden}{severity}
+		|| $tag_info->{overridden}{significance};
     }
     for my $k (qw( severity significance override )) {
 	$stats{$current}{overrides}{$k}{$tag_info->{overridden}{$k}}++