lintian: r1283 - in trunk: debian reporting

[rra@debian.org]

Author: rra
Date: 2008-04-26 06:03:43 +0200 (Sat, 26 Apr 2008)
New Revision: 1283

Modified:
   trunk/debian/changelog
   trunk/reporting/html_reports
Log:
* reporting/html_reports:
  + [RA] Base the generation of clean report pages on the maintainer URL
    rather than the full maintainer string so that maintainers with
    different forms of their name won't have clean reports that
    overwrite dirty ones.
  + [RA] Fix the counts in qa-list.txt, which were broken in several
    respects.
  + [RA] Don't consider a maintainer's page error/warning free if there
    are errors or warnings in their co-maintained packages.


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2008-04-26 01:26:10 UTC (rev 1282)
+++ trunk/debian/changelog	2008-04-26 04:03:43 UTC (rev 1283)
@@ -84,6 +84,16 @@
   * man/lintian.1:
     + [FL] Drop linda from SEE ALSO since it is obsolete now. Suggested
       by Hideki Yamane. (Closes: #474478)
+
+  * reporting/html_reports:
+    + [RA] Base the generation of clean report pages on the maintainer URL
+      rather than the full maintainer string so that maintainers with
+      different forms of their name won't have clean reports that
+      overwrite dirty ones.
+    + [RA] Fix the counts in qa-list.txt, which were broken in several
+      respects.
+    + [RA] Don't consider a maintainer's page error/warning free if there
+      are errors or warnings in their co-maintained packages.
   
   * testset/copyright:
     + [FL] New testcases by Tobias Toedter.  (Closes: #472665)

Modified: trunk/reporting/html_reports
===================================================================
--- trunk/reporting/html_reports	2008-04-26 01:26:10 UTC (rev 1282)
+++ trunk/reporting/html_reports	2008-04-26 04:03:43 UTC (rev 1283)
@@ -262,7 +262,9 @@
 # Lintian-clean.
 my %clean;
 for my $source (keys %source_info) {
-    $clean{$source_info{$source}->{maintainer}} = 1;
+    my $maintainer = $source_info{$source}->{maintainer};
+    my $id = maintainer_url ($maintainer);
+    $clean{$id} = $maintainer;
 }
 
 # Now, walk through the tags by source package (sorted by maintainer).  Output
@@ -277,14 +279,15 @@
         sort grep { !$seen{$_}++ } keys (%by_maint), keys (%by_uploader);
 }
 for my $maintainer (@maintainers) {
-    delete $clean{$maintainer};
+    my $id = maintainer_url ($maintainer);
+    delete $clean{$id};
 
     # For each of this maintainer's packages, add statistical information
     # about warnings and errors to the QA list and build the packages hash
     # used for the package index.  We only do this for the maintainer
     # packages, not the uploader packages, to avoid double-counting.
-    my ($errors, $warnings) = (0, 0);
     for my $source (keys %{ $by_maint{$maintainer} }) {
+        my ($errors, $warnings) = (0, 0);
         for my $version (keys %{ $by_maint{$maintainer}{$source} }) {
             my $tags = $by_maint{$maintainer}{$source}{$version};
             for my $tag (@$tags) {
@@ -296,16 +299,33 @@
         $qa{$source} = [ $errors, $warnings ];
     }
 
+    # Determine if the maintainer's page is clean.  Check all packages for
+    # which they're either maintainer or uploader and set $error_clean if
+    # they have no errors or warnings.
+    my $error_clean = 1;
+    for my $source (keys %{ $by_maint{$maintainer} },
+                    keys %{ $by_uploader{$maintainer} }) {
+        my $versions = $by_maint{$maintainer}{$source}
+            || $by_uploader{$maintainer}{$source};
+        for my $version (keys %$versions) {
+            my $tags = $versions->{$version};
+            for my $tag (@$tags) {
+                $error_clean = 0 if ($tag->{code} eq 'E');
+                $error_clean = 0 if ($tag->{code} eq 'W');
+            }
+        }
+    }
+
     # Determine the parts of the maintainer and the file name for the
     # maintainer page.
     my ($name, $email) = ($maintainer =~ /^(.*) <([^>]+)>/);
     $email = 'unknown' unless $email;
-    my $id = maintainer_url ($maintainer);
     my $regular = "maintainer/$id";
     my $full = "full/$id";
 
     # Create the regular maintainer page (only errors and warnings) and the
     # full maintainer page (all tags, including overrides and info tags).
+    print "Generating page for $id\n";
     my %data = (
         email      => html_quote ($email),
         errors     => 1,
@@ -318,10 +338,10 @@
         version    => $LINTIAN_VERSION
     );
     my $template;
-    if ($errors || $warnings) {
+    if ($error_clean) {
+        $template = $templates{clean};
+    } else {
         $template = $templates{maintainer};
-    } else {
-        $template = $templates{clean};
     }
     output_template ($regular, $template, \%data);
     $template = $templates{maintainer};
@@ -349,7 +369,8 @@
 close QA or die "cannot write to qa-list: $!\n";
 
 # Now, generate stub pages for every maintainer who has only clean packages.
-for my $maintainer (keys %clean) {
+for my $id (keys %clean) {
+    my $maintainer = $clean{$id};
     my ($name, $email) = ($maintainer =~ /^(.*) <([^>]+)>/);
     $email = 'unknown' unless $email;
     my %data = (
@@ -359,8 +380,7 @@
         timestamp  => $timestamp,
         version    => $LINTIAN_VERSION
     );
-    my $id = maintainer_url ($maintainer);
-    next if $saw_maintainer{$id};
+    print "Generating clean page for $id\n";
     output_template ("maintainer/$id", $templates{clean}, \%data);
     output_template ("full/$id", $templates{clean}, \%data);
 }
@@ -501,6 +521,7 @@
         } else {
             $urlmap{$url} = $maintainer;
         }
+        return $maintainer;
     }
 }