lintian: r319 - in trunk: debian reporting
Author: djpig
Date: 2004-07-03 21:21:21 +0200 (Sat, 03 Jul 2004)
New Revision: 319
Removed:
trunk/reporting/bug.status
Modified:
trunk/debian/changelog
trunk/reporting/harness
trunk/reporting/html_reports
Log:
Correctly support udeb packages
Remove some unused code for bug references
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2004-07-03 18:52:06 UTC (rev 318)
+++ trunk/debian/changelog 2004-07-03 19:21:21 UTC (rev 319)
@@ -115,7 +115,15 @@
correctly
+ [FL] a space after the colon is not mandatory in dpkg control
files
-
+
+ * reporting/harness:
+ + [FL] Correctly support udeb packages
+ * reporting/html_reports:
+ + [FL] Correctly support udeb packages
+ + [FL] Remove some unused code for bug references
+ * reporting/bug.status:
+ + [FL] Remove
+
* testset/filenames:
+ [JvW] Fix two lintian warnings in lintian itself by touching files only
on clean target, and not distributing them in the source
Deleted: trunk/reporting/bug.status
===================================================================
--- trunk/reporting/bug.status 2004-07-03 18:52:06 UTC (rev 318)
+++ trunk/reporting/bug.status 2004-07-03 19:21:21 UTC (rev 319)
@@ -1,123 +0,0 @@
-#14370: apache-modules: copyright-file-compressed
-#14372: bsdmainutils: copyright-file-compressed
-#14378: chinese-big5: copyright-file-compressed
-#14381: cfgtool: copyright-file-compressed
-#14385: diablo: copyright-file-compressed
-#14388: dwww: copyright-file-compressed
-#14389: dds2tar: copyright-file-compressed
-#14390: dupload: copyright-file-compressed
-#14391: elvis-tiny: copyright-file-compressed
-#14392: bible-kjv: copyright-file-compressed
-#14396: ghostview: copyright-file-compressed
-#14399: gnuserv: copyright-file-compressed
-#14402: gv: copyright-file-compressed
-#14404: inn: copyright-file-compressed
-#14406: ispanish: copyright-file-compressed
-#14409: kmodplayer: copyright-file-compressed
-#14410: isite: copyright-file-compressed
-#14412: liblockfile-dev: copyright-file-compressed
-#14413: liblockfile0: copyright-file-compressed
-#14418: logwrites: copyright-file-compressed
-#14419: liwc: copyright-file-compressed
-#14421: lilo: copyright-file-compressed
-#14422: metro-motif-demobin: copyright-file-compressed
-#14423: libnfslock: copyright-file-compressed
-#14424: metro-motif-aout: copyright-file-compressed
-#14428: metrox: copyright-file-compressed
-#14429: metro-motif-devel: copyright-file-compressed
-#14430: metro-motif-demosrc: copyright-file-compressed
-#14431: loadmeter: copyright-file-compressed
-#14432: metro-motif-bin: copyright-file-compressed
-#14457: xega: copyright-file-compressed
-#14458: xcal: copyright-file-compressed
-#14459: nfsroot: copyright-file-compressed
-#14461: ppp: copyright-file-compressed
-#14462: smail: copyright-file-compressed
-#14463: xskat: copyright-file-compressed
-#14464: xwave: copyright-file-compressed
-#14466: rsynth: copyright-file-compressed
-#14470: xxgdb: copyright-file-compressed
-#14473: ucbmpeg: copyright-file-compressed
-#14474: uucp: copyright-file-compressed
-#14475: xaw3d: copyright-file-compressed
-#14476: tkgofer: copyright-file-compressed
-#14477: mgetty: copyright-file-compressed
-#14478: mkisofs: copyright-file-compressed
-#14479: newsgate: copyright-file-compressed
-#14480: mosaic: copyright-file-compressed
-#14483: psutils: copyright-file-compressed
-#14485: olwm: copyright-file-compressed
-#14489: squid: copyright-file-compressed
-#14490: xaw3dg: copyright-file-compressed
-#14492: nethack: copyright-file-compressed
-#14494: pixmap: copyright-file-compressed
-#14498: vice: copyright-file-compressed
-#14499: xautolock: copyright-file-compressed
-#14501: xviewg: copyright-file-compressed
-#14503: ncompress: copyright-file-compressed
-#14504: publib-dev: copyright-file-compressed
-#14505: oldmitpthreads: copyright-file-compressed
-#14507: olvwm: copyright-file-compressed
-#14511: sinuskey-login: copyright-file-compressed
-#14512: nedit-smotif: copyright-file-compressed
-#14513: metro-motif-man: copyright-file-compressed
-#14514: metro-motif-lib: copyright-file-compressed
-#14515: netpbm: copyright-file-compressed
-#16739: libjpegg6a: invalid-standards-version
-#16740: nfsroot: invalid-standards-version
-#16741: tkstep4.2: invalid-standards-version
-#16742: tkstep8.0: invalid-standards-version
-#16743: yabasic: invalid-standards-version
-#16744: lrzsz: invalid-standards-version
-#16745: swish: invalid-standards-version
-#16746: tkps: invalid-standards-version
-#16747: bsdmainutils: invalid-standards-version
-#16748: alias: invalid-standards-version
-#16749: gom: invalid-standards-version
-#16751: bsdutils: invalid-standards-version
-#16753: ed: invalid-standards-version
-#16754: dbview: invalid-standards-version
-#16755: gwm: invalid-standards-version
-#16756: lha: invalid-standards-version
-#16758: nntp: invalid-standards-version
-#16759: procmail-lib: invalid-standards-version
-#16760: rman: invalid-standards-version
-#16761: sgrep: invalid-standards-version
-#16762: scm: invalid-standards-version
-#16764: xmikmod: invalid-standards-version
-#16766: tracker: invalid-standards-version
-#16767: slib: invalid-standards-version
-#16768: super: invalid-standards-version
-#16770: uudeview: invalid-standards-version
-#16771: xwave: invalid-standards-version
-#16772: zoo: invalid-standards-version
-#16774: loadmeter: invalid-standards-version
-#16775: apmd: invalid-standards-version
-#16776: libpthread0: invalid-standards-version
-#16777: mosaic: invalid-standards-version
-#16778: display-dhammapada: invalid-standards-version
-#16779: tgif: invalid-standards-version
-#16780: pmake: invalid-standards-version
-#16782: mpack: invalid-standards-version
-#18871: alias: spelling-error-in-description
-#18874: apcd: spelling-error-in-description
-#18876: asa: spelling-error-in-description
-#18878: asp: spelling-error-in-description
-#18883: circus: spelling-error-in-description
-#18893: epic: spelling-error-in-description
-#18894: exmh: spelling-error-in-description
-#18914: icont: spelling-error-in-description
-#18927: opie: spelling-error-in-description
-#18938: nis: spelling-error-in-description
-#18946: joe: spelling-error-in-description
-#18947: ppd-gs: spelling-error-in-description
-#18966: sysutils: spelling-error-in-description
-#18972: termcap-compat: spelling-error-in-description
-#18978: pvm-dev: spelling-error-in-description
-#18992: tnt: spelling-error-in-description
-#18995: radiusd-livingston: spelling-error-in-description
-#19001: xemacs19-support: spelling-error-in-description
-#19005: libtimedate-perl: spelling-error-in-description
-#19009: xless: spelling-error-in-description
-#19012: xaw3d: spelling-error-in-description
-#19014: tix41: spelling-error-in-description
Modified: trunk/reporting/harness
===================================================================
--- trunk/reporting/harness 2004-07-03 18:52:06 UTC (rev 318)
+++ trunk/reporting/harness 2004-07-03 19:21:21 UTC (rev 319)
@@ -62,7 +62,7 @@
# import perl libraries
unshift @INC, "$LINTIAN_ROOT/lib";
require Read_pkglists;
-use vars qw(%binary_info %source_info); # from the above
+use vars qw(%binary_info %source_info %udeb_info); # from the above
require Util;
# turn file buffering off
@@ -89,6 +89,8 @@
if ($opt_c) { # purge the old packages
system("rm -rf $LINTIAN_LAB/binary") == 0 || die "$!";
system("mkdir -m 2775 $LINTIAN_LAB/binary") == 0 || die "$!";
+ system("rm -rf $LINTIAN_LAB/udeb") == 0 || die "$!";
+ system("mkdir -m 2775 $LINTIAN_LAB/udeb") == 0 || die "$!";
system("rm -rf $LINTIAN_LAB/source") == 0 || die "$!";
system("mkdir -m 2775 $LINTIAN_LAB/source") == 0 || die "$!";
system("rm -f $LINTIAN_LAB/info/*") == 0 || die "$!";
@@ -127,12 +129,18 @@
my $pkgfile;
my %skip_binary;
+ my %skip_udeb;
my %skip_source;
# read binary packages files
$pkgfile = "$LINTIAN_LAB/info/binary-packages";
(-f $pkgfile) or Die("cannot find list of binary packages $pkgfile");
read_bin_list($pkgfile);
+
+ # read udeb packages files
+ $pkgfile = "$LINTIAN_LAB/info/udeb-packages";
+ (-f $pkgfile) or Die("cannot find list of udeb packages $pkgfile");
+ read_udeb_list($pkgfile);
# read source packages files
$pkgfile = "$LINTIAN_LAB/info/source-packages";
@@ -148,7 +156,7 @@
while (<IN>) {
chop;
- if (/^N: Listed (changed|new) (binary|source) package (\S+) (\S+)/o) {
+ if (/^N: Listed (changed|new) (binary|udeb|source) package (\S+) (\S+)/o) {
my ($type,$binsrc,$pkg,$ver) = ($1,$2,$3,$4);
Log("$type $binsrc package $pkg $ver");
@@ -158,13 +166,18 @@
$data or Die("cannot find binary package $pkg in binary-packages file");
print OUT "b $binary_info{$pkg}->{'package'} $binary_info{$pkg}->{'version'} $LINTIAN_ARCHIVEDIR/$binary_info{$pkg}->{'file'}\n";
$skip_binary{$pkg} = 1;
+ } elsif ($binsrc eq 'udeb') {
+ my $data = $udeb_info{$pkg};
+ $data or Die("cannot find udeb package $pkg in udeb-packages file");
+ print OUT "u $udeb_info{$pkg}->{'package'} $udeb_info{$pkg}->{'version'} $LINTIAN_ARCHIVEDIR/$udeb_info{$pkg}->{'file'}\n";
+ $skip_udeb{$pkg} = 1;
} else {
my $data = $source_info{$pkg};
$data or Die("cannot find source package $pkg in source-packages file");
print OUT "s $source_info{$pkg}->{'source'} $source_info{$pkg}->{'version'} $LINTIAN_ARCHIVEDIR/$source_info{$pkg}->{'file'}\n";
$skip_source{$pkg} = 1;
}
- } elsif (/^N: Removed (binary|source) package (\S+)/o) {
+ } elsif (/^N: Removed (binary|udeb|source) package (\S+)/o) {
my ($binsrc,$pkg) = ($1,$2);
Log("removed $binsrc package $pkg");
@@ -172,6 +185,8 @@
or Log("could not remove $binsrc package $pkg");
if ($binsrc eq 'binary') {
$skip_binary{$pkg} = 1;
+ } elsif ($binsrc eq 'udeb') {
+ $skip_udeb{$pkg} = 1;
} else {
$skip_source{$pkg} = 1;
}
@@ -194,11 +209,13 @@
or Die("cannot open lintian.log $lintian_log for writing: $!");
my $copy_mode = 1;
while (<IN>) {
- if (/^N: Processing (binary|source) package (\S+)/o) {
+ if (/^N: Processing (binary|udeb|source) package (\S+)/o) {
my ($type,$pkg) = ($1,$2);
if ($type eq 'binary') {
$copy_mode = not exists $skip_binary{$pkg};
+ } elsif ($type eq 'udeb') {
+ $copy_mode = not exists $skip_udeb{$pkg};
} else {
$copy_mode = not exists $skip_source{$pkg};
}
Modified: trunk/reporting/html_reports
===================================================================
--- trunk/reporting/html_reports 2004-07-03 18:52:06 UTC (rev 318)
+++ trunk/reporting/html_reports 2004-07-03 19:21:21 UTC (rev 319)
@@ -20,6 +20,8 @@
# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
# MA 02111-1307, USA.
+use strict;
+
# Maximum number of identical tags per package:
my $max_tags = 8;
@@ -37,7 +39,7 @@
use Read_taginfo;
my %tag_info = %{read_tag_info('html')};
use Read_pkglists;
-use vars qw(%binary_info %source_info %bin_src_ref); # from the above
+use vars qw(%binary_info %source_info %udeb_info %bin_src_ref); # from the above
# Determine Lintian version
chomp(my $LINTIAN_VERSION = `$LINTIAN_ROOT/frontend/lintian --print-version`);
@@ -57,6 +59,7 @@
# Read configuration file
read_bin_list();
+read_udeb_list();
# read_src_list(); # not necessary, get_bin_src_ref will run it
get_bin_src_ref();
@@ -67,6 +70,7 @@
my ($num_errors, $num_warnings, $num_experimental, $num_overridden);
$num_errors = $num_warnings = $num_experimental = $num_overridden = 0;
my (%by_src, %by_tag);
+my %anchor;
# process input
while (<>) {
@@ -105,7 +109,8 @@
if (not exists $source_info{$src}) {
# work around:
$source_info{$src}->{'maintainer'} =
- $binary_info{$pkg}->{'maintainer'} || '(unknown)';
+ $binary_info{$pkg}->{'maintainer'} ||
+ $udeb_info{$pkg}->{'maintainer'} || '(unknown)';
$source_info{$src}->{'version'} = $binary_info{$pkg}->{'version'};
}
@@ -115,9 +120,9 @@
open_qa_list();
open_maintainer_index();
-read_bug_file("$LINTIAN_ROOT/reporting/bug.status");
my ($src_num_errors, $src_num_warnings);
+my ($num_binpkg, $num_udebpkg, $num_maint, $num_srcpkg);
# Create per-maintainer list
for my $src (sort by_maint keys %by_src) {
@@ -139,16 +144,17 @@
$src_num_errors++ if $code eq 'E';
$src_num_warnings++ if $code eq 'W';
- if ($pkg ne $lastpkg and $type ne ' source') {
+ if ($pkg ne $lastpkg and $type eq ' binary') {
$num_binpkg++;
drop_anchor($pkg, "");
+ } elsif ($pkg ne $lastpkg and $type eq ' udeb') {
+ $num_udebpkg++;
+ drop_anchor($pkg, "");
}
if ($tag ne $lasttag or $pkg ne $lastpkg) {
output_chunk(\@tags) if @tags;
undef @tags;
- my $b = bug_number("$pkg: $tag");
- $rest .= " [" . make_bugref($b) . "]" if $b;
}
$lastpkg = $pkg; $lasttag = $tag;
@@ -171,6 +177,7 @@
for my $tag (sort keys %by_tag) {
my $lastpkg = "";
my $tag_pkgs = 0;
+ my @tags;
open_tag_file($tag);
@@ -187,8 +194,6 @@
undef @tags;
}
- my $b = bug_number("$pkg: $tag");
- $rest .= " [" . make_bugref($b) . "]" if $b;
}
$lastpkg = $pkg;
@@ -235,6 +240,7 @@
output_packages(\@list4,'packages_4.html','S-Z');
# Read old statistics file
+my $old_stat;
if (-f $statistics_file) {
($old_stat) = read_dpkg_control($statistics_file);
}
@@ -245,6 +251,7 @@
my $delta_num_maint = sprintf "%+d",$num_maint-$old_stat->{'maintainers'};
my $delta_num_srcpkg = sprintf "%+d",$num_srcpkg-$old_stat->{'source-packages'};
my $delta_num_binpkg = sprintf "%+d",$num_binpkg-$old_stat->{'binary-packages'};
+my $delta_num_udebpkg = sprintf "%+d",$num_udebpkg-$old_stat->{'udeb-packages'};
my $delta_num_warnings = sprintf "%+d",$num_warnings-$old_stat->{'warnings'};
my $delta_num_errors = sprintf "%+d",$num_errors-$old_stat->{'errors'};
my $delta_num_experimental = sprintf "%+d",$num_experimental-$old_stat->{'experimental'};
@@ -257,6 +264,7 @@
$stat->{'maintainers'} = $num_maint;
$stat->{'source-packages'} = $num_srcpkg;
$stat->{'binary-packages'} = $num_binpkg;
+$stat->{'udeb-packages'} = $num_udebpkg;
$stat->{'warnings'} = $num_warnings;
$stat->{'errors'} = $num_errors;
$stat->{'experimental'} = $num_experimental;
@@ -324,9 +332,9 @@
<tr><td>Maintainers listed:</td> <td>$num_maint ($delta_num_maint)</td></tr>
<tr><td>Source packages listed:</td> <td>$num_srcpkg ($delta_num_srcpkg)</td></tr>
<tr><td>Binary packages listed:</td> <td>$num_binpkg ($delta_num_binpkg)</td></tr>
+<tr><td>Udeb packages listed:</td> <td>$num_udebpkg ($delta_num_udebpkg)</td></tr>
<tr><td>Warnings:</td> <td>$num_warnings ($delta_num_warnings)</td></tr>
<tr><td>Errors:</td> <td>$num_errors ($delta_num_errors)</td></tr>
-<tr><td>Experimental tags:</td> <td>$num_experimental ($delta_num_experimental)</td></tr>
<tr><td>Overridden tags:</td> <td>$num_overridden ($delta_num_overridden)</td></tr>
<tr><td>Lintian version:</td> <td>$LINTIAN_VERSION</td></tr>
</table>
@@ -569,34 +577,6 @@
# -------------------------------
-my %bugs;
-
-sub read_bug_file {
- undef %bugs;
- open(B,$_[0]) or die "cannot open file $_[0] for reading: $!";
- while (<B>) {
- chop;
- next if /^\s*$/;
- /^\#(\d+):\s+(.*\S)\s*$/ or die "syntax error in $_[0]: $_";
- $bugs{$2} = $1;
- }
- close(B);
-}
-
-sub bug_number {
- return $bugs{$_[0]};
-}
-
-sub make_bugref {
- my $bugnum = shift;
- my $bugdir = substr($bugnum, 0, 2);
-
- return "<a href=\"http://www.debian.org/Bugs/db/$bugdir/$bugnum.html\";>"
- . "\#$bugnum</a>";
-}
-
-# -------------------------------
-
sub by_maint {
$source_info{$a}->{'maintainer'} cmp $source_info{$b}->{'maintainer'};
}
Reply to: