[SCM] Debian package checker branch, master, updated. 2.5.11-193-g72bbb0f
The following commit has been merged in the master branch:
commit 72bbb0fa015fc40cba5b52f4e161895c067b7823
Author: Niels Thykier <niels@thykier.net>
Date: Tue Mar 26 23:14:23 2013 +0100
lintian: Add --no-display-experimental command line option
Signed-off-by: Niels Thykier <niels@thykier.net>
diff --git a/debian/changelog b/debian/changelog
index a04a413..52ffc4e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -194,6 +194,7 @@ lintian (2.5.12) UNRELEASED; urgency=low
to --profile.
+ [NT] Add new command line option "--ignore-lintian-env" to make
lintian ignore all environment variables starting with LINTIAN_.
+ + [NT] Add a new command line option --no-display-experimental.
* lib/Lintian/Collect.pm:
+ [NT] Add "is_non_free" method to easily check of a given
diff --git a/frontend/lintian b/frontend/lintian
index 8d852d1..401237d 100755
--- a/frontend/lintian
+++ b/frontend/lintian
@@ -189,6 +189,7 @@ Behaviour options:
--color never/always/auto disable, enable, or enable color for TTY
--display-source X restrict displayed tags by source
-E, --display-experimental display "X:" tags (normally suppressed)
+ --no-display-experimental suppress "X:" tags
--fail-on-warnings return a non-zero exit status if warnings found
-i, --info give detailed info about tags
-I, --display-info display "I:" tags (normally suppressed)
@@ -482,7 +483,7 @@ my %opthash = ( # ------------------ actions
# ------------------ behaviour options
'info|i' => \$opt{'info'},
'display-info|I' => \&display_infotags,
- 'display-experimental|E' => \$opt{'display-experimental'},
+ 'display-experimental|E!' => \$opt{'display-experimental'},
'pedantic' => \&display_pedantictags,
'display-level|L=s' => \&record_display_level,
'display-source=s' => \&record_display_source,
diff --git a/man/lintian.pod.in b/man/lintian.pod.in
index 835e84b..96227aa 100644
--- a/man/lintian.pod.in
+++ b/man/lintian.pod.in
@@ -214,10 +214,10 @@ being the Policy Manual and the Developer Reference (respectively).
The entire list of sources can be found in
I<$LINTIAN_ROOT/data/output/manual-references>
-=item B<-E>, B<--display-experimental>
+=item B<-E>, B<--display-experimental>, B<--no-display-experimental>
-Display experimental ("X:") tags as well. They are normally
-suppressed.
+Control whether to display experimental ("X:") tags. They are
+normally suppressed.
If a tag is marked experimental, this means that the code that
generates this message is not as well tested as the rest of Lintian,
@@ -225,7 +225,7 @@ 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 (particularly if they include fixes).
-This option overrides the B<display-experimental> variable in the
+These options overrides the B<display-experimental> variable in the
configuration file.
=item B<--fail-on-warnings>
--
Debian package checker
Reply to: