[SCM] Debian package checker branch, master, updated. 924aad805f027f92a0530e1e20478bb4a5120345
The following commit has been merged in the master branch:
commit 924aad805f027f92a0530e1e20478bb4a5120345
Author: Adam D. Barratt <adam@adam-barratt.org.uk>
Date: Tue Jul 1 19:12:20 2008 +0100
(Re-)Add support for experimental tags
* doc/lintian.sgml
+ [ADB] Add reference to new option to display experimental tags.
* frontend/lintian:
+ [ADB] Add a new --show-experimental / -E option which indicates
that experimental tags should be displayed.
* lib/Tags.pm:
+ [ADB] (Re-)Add support for experimental tags.
* man/lintian.1:
+ [ADB] Document new option to display experimental tags.
* reporting/harness:
+ [ADB] Process packages using -E so that experimental tags are included.
* reporting/templates/clean.tmpl:
+ [ADB] Note that the full report includes experimental tags.
* reporting/templates/maintainer.tmpl:
+ [ADB] Note that the full report includes experimental tags.
diff --git a/debian/changelog b/debian/changelog
index 5e52d26..fbfe548 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -74,19 +74,32 @@ lintian (1.24.2) unstable; urgency=low
* doc/CREDITS:
+ [FL] Add Raphael Geissert and Adam D. Barratt.
-
+ * doc/lintian.sgml:
+ + [ADB] Add reference to new option to display experimental tags.
+
+ * frontend/lintian:
+ + [ADB] Add a new --show-experimental / -E option which indicates
+ that experimental tags should be displayed.
+
* lib/Lintian/Collect/Binary.pm:
+ [FL] Add support for file-info file.
+ [FL] Add support for objdump-info file.
* lib/Spelling.pm:
+ [RA] Add a couple more spelling corrections and capitalization
checks for LaTeX and TeX. Thanks, Raphael Geissert.
+ * lib/Tags.pm:
+ + [ADB] (Re-)Add support for experimental tags.
* man/lintian.1:
+ [FL] Document watch-file check.
+ + [ADB] Document new option to display experimental tags.
+ * reporting/harness:
+ + [ADB] Process packages using -E so that experimental tags are included.
* reporting/html_reports:
+ [FL] Mark the tag pages with the correct code.
+ * reporting/templates/clean.tmpl:
+ + [ADB] Note that the full report includes experimental tags.
* reporting/templates/tag.tmpl:
+ [FL] Mark overridden tags.
* reporting/templates/maintainer.tmpl:
@@ -95,6 +108,7 @@ lintian (1.24.2) unstable; urgency=low
+ [FL] Include Co-maintained packages in the summary
at the top of the page. Also sort the list. Patch
by Jordà Polo.
+ + [ADB] Note that the full report includes experimental tags.
--
diff --git a/doc/lintian.sgml b/doc/lintian.sgml
index 96f5a37..6b8953b 100644
--- a/doc/lintian.sgml
+++ b/doc/lintian.sgml
@@ -346,6 +346,7 @@ of Lintian, and might still give surprising results. Feel free to
ignore Experimental messages that do not seem to make sense, though of
course bug reports are always welcomed.
+They are not displayed unless the <tt>-E</tt> option is set.
<p>
<tag><em>Overridden (O)</em>
diff --git a/frontend/lintian b/frontend/lintian
index 599698a..95f03bf 100755
--- a/frontend/lintian
+++ b/frontend/lintian
@@ -50,6 +50,7 @@ my @debug;
my $check_everything = 0; #flag for -a|--all switch
my $lintian_info = 0; #flag for -i|--info switch
our $display_infotags = 0; #flag for -I|--display-info switch
+our $display_experimentaltags = 0; #flag for -E|--display-experimental switch
my $unpack_level = undef; #flag for -l|--unpack-level switch
our $no_override = 0; #flag for -o|--no-override switch
our $show_overrides = 0; #flag for --show-overrides switch
@@ -139,6 +140,7 @@ General options:
Behaviour options:
-i, --info give detailed info about tags
-I, --display-info display "I:" tags (normally suppressed)
+ -E, --display-experimental display "X:" tags (normally suppressed)
-l X, --unpack-level X set default unpack level to X
-o, --no-override ignore overrides
--show-overrides output tags that have been overriden
@@ -258,6 +260,7 @@ my %opthash = ( # ------------------ actions
# ------------------ behaviour options
"info|i" => \$lintian_info,
"display-info|I" => \$display_infotags,
+ "display-experimental|E" => \$display_experimentaltags,
"unpack-level|l=i" => \$unpack_level,
"no-override|o" => \$no_override,
"show-overrides" => \$show_overrides,
@@ -981,6 +984,7 @@ if (defined $experimental_output_opts) {
}
$Tags::show_info = $display_infotags;
+$Tags::show_experimental = $display_experimentaltags;
$Tags::show_overrides = $show_overrides;
$Tags::color = $color;
use warnings;
diff --git a/lib/Tags.pm b/lib/Tags.pm
index f107d6f..b34ab8b 100644
--- a/lib/Tags.pm
+++ b/lib/Tags.pm
@@ -39,6 +39,7 @@ use Term::ANSIColor;
our $verbose = $::verbose;
our $debug = $::debug;
our $show_info = 0;
+our $show_experimental = 0;
our $show_overrides = 0;
our $output_formatter = \&print_tag;
our $min_severity = 1;
@@ -280,6 +281,7 @@ sub print_tag {
$extra = '' if $extra eq ' ';
my $code = $codes{$tag_info->{type}};
my $severity = $type_to_sev{$tag_info->{type}};
+ $code = 'X' if exists $tag_info->{experimental};
$code = 'O' if $tag_info->{overridden}{override};
my $type = '';
$type = " $pkg_info->{type}" if $pkg_info->{type} ne 'binary';
@@ -304,6 +306,7 @@ sub print_tag_new {
$extra = " @$information" if @$information;
$extra = '' if $extra eq ' ';
my $code = $sev_to_code[$tag_info->{severity}];
+ $code = 'X' if exists $tag_info->{experimental};
$code = 'O' if $tag_info->{overridden}{override};
my $qualifier = $sig_to_qualifier[$tag_info->{significance}];
$qualifier = '' if $code eq 'O';
@@ -341,6 +344,9 @@ sub tag {
record_stats( $tag_info );
+ return 0 if
+ exists $tag_info->{experimental} and !$show_experimental;
+
return 1 if
$tag_info->{overridden}{severity} != 0
|| $tag_info->{overridden}{significance} != 0
diff --git a/man/lintian.1 b/man/lintian.1
index 6097613..6d0d76b 100644
--- a/man/lintian.1
+++ b/man/lintian.1
@@ -150,6 +150,10 @@ addition to the lintian error tags.
Display informational ("I:") tags as well. They are normally suppressed.
.TP
+.BR \-E ", " \-\-display\-experimental
+Display experimental ("X:") tags as well. They are normally suppressed.
+
+.TP
.BR \-l " n, " \-\-unpack\-level " n"
Set unpack level to
.IR n .
diff --git a/reporting/harness b/reporting/harness
index b34fc95..9142552 100755
--- a/reporting/harness
+++ b/reporting/harness
@@ -115,7 +115,7 @@ unless ($opt_f || $opt_c) {
if ($opt_f) { # check all packages
Log("Running Lintian over all packages...");
- my $cmd = "$lintian_cmd -I -v -a --show-overrides -U changelog-file >$lintian_log";
+ my $cmd = "$lintian_cmd -I -E -v -a --show-overrides -U changelog-file >$lintian_log";
Log("Executing $cmd");
my $res = (system($cmd) >> 8);
(($res == 0) or ($res == 1))
@@ -232,7 +232,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 -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";
Log("Executing $cmd");
my $res = (system($cmd) >> 8);
(($res == 0) or ($res == 1))
diff --git a/reporting/templates/clean.tmpl b/reporting/templates/clean.tmpl
index ace01f4..8317428 100644
--- a/reporting/templates/clean.tmpl
+++ b/reporting/templates/clean.tmpl
@@ -4,7 +4,7 @@
<p>
All of the packages maintained by {$maintainer} are Lintian-clean.
But also see the <a href="../full/{$id}">full report</a>, which includes
- info and overridden tags.
+ info, experimental and overridden tags.
</p>
<p>
diff --git a/reporting/templates/maintainer.tmpl b/reporting/templates/maintainer.tmpl
index 11b5919..18ec72a 100644
--- a/reporting/templates/maintainer.tmpl
+++ b/reporting/templates/maintainer.tmpl
@@ -8,7 +8,7 @@
{
if ($errors) {
qq( See also the <a href="../full/$id">full report</a>, including)
- . " info and overridden tags.";
+ . " info, experimental and overridden tags.";
} else {
qq( See also the <a href="../maintainer/$id">report showing)
. " only errors and warnings</a>.";
--
Debian package checker
Reply to: