reporting/harness and stderr

["Adam D. Barratt" <adam@adam-barratt.org.uk>]

Hi,

After a suggestion from Frank earlier today I had a look at how
difficult merging the stdout and stderr streams from the reporting
harness would be, in order to make it possible to identify which
packages were causing errors.

As far as I can see, the following trivial patch to
reporting/{harness,html_reports} would achieve this. The only thing it
loses us is the ability to generate pages for tags which don't have any
information in the description file; I'm tempted to say that should be
folded in to read_tag_info() instead anyway, as such a tag is fairly
fundamentally broken.

Comments / pointing out what I've missed welcome (I haven't committed
yet as it seemed too simple ;-)

Adam

diff --git a/reporting/harness b/reporting/harness
index c5ce5d2..e8ba97b 100755
--- a/reporting/harness
+++ b/reporting/harness
@@ -116,7 +116,7 @@ unless ($opt_f || $opt_c) {
 
 if ($opt_f) { # check all packages
   Log("Running Lintian over all packages...");
-  my $cmd = "$lintian_cmd -I -E -v -a --show-overrides -U changelog-file >$lintian_log";
+  my $cmd = "$lintian_cmd -I -E -v -a --show-overrides -U changelog-file >$lintian_log 2>&1";
   Log("Executing $cmd");
   my $res = (system($cmd) >> 8);
   (($res == 0) or ($res == 1))
@@ -233,7 +233,7 @@ if ($opt_i) { # process changes only
 
     # run Lintian over the newly introduced or changed packages
     Log("Running Lintian over newly introduced and changed packages...");
-    my $cmd = "$lintian_cmd -I -E -v --show-overrides -p $list_file -U changelog-file >>$lintian_log";
+    my $cmd = "$lintian_cmd -I -E -v --show-overrides -p $list_file -U changelog-file >>$lintian_log 2>&1";
     Log("Executing $cmd");
     my $res = (system($cmd) >> 8);
     (($res == 0) or ($res == 1))
diff --git a/reporting/html_reports b/reporting/html_reports
index f548317..41b2e73 100755
--- a/reporting/html_reports
+++ b/reporting/html_reports
@@ -194,6 +194,7 @@ while (<>) {
     chomp;
     next unless m/^([EWIXO]): (\S+)(?: (\S+))?: (\S+)(?:\s+(.*))?/;
     my ($code, $package, $type, $tag, $extra) = ($1, $2, $3, $4, $5);
+    next unless $tag_info{$tag});
     $type = 'binary' unless (defined $type);
     next unless ($type eq 'source' || $type eq 'binary' || $type eq 'udeb');