[lintian] 01/01: lintian: Add --hide-overrides option
This is an automated email from the git hooks/post-receive script.
nthykier pushed a commit to branch master
in repository lintian.
commit e95106d78c4c5515efff3ba88555cf1cbf17b4f4
Author: Niels Thykier <niels@thykier.net>
Date: Thu Jul 9 19:57:49 2015 +0200
lintian: Add --hide-overrides option
Signed-off-by: Niels Thykier <niels@thykier.net>
---
debian/changelog | 4 ++++
frontend/lintian | 2 ++
man/lintian.pod.in | 21 ++++++++++++++-------
3 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 702fed8..18b4842 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -39,6 +39,10 @@ lintian (2.5.33) UNRELEASED; urgency=medium
+ [JW] Correct spelling for "GNU Public Licence".
(Closes: #790369)
+ * frontend/lintian:
+ + [JW, NT] Add "--hide-overrides" option to contrast
+ the "--show-overrides" option. (Closes: #770643)
+
* helpers/coll/objdump-info-helper:
+ [NT] Fix use of undefined variable in some cases.
+ [JW,NT] Gracefully cope with upstreams storing poems in
diff --git a/frontend/lintian b/frontend/lintian
index bd614dc..d656f8b 100755
--- a/frontend/lintian
+++ b/frontend/lintian
@@ -221,6 +221,7 @@ Behaviour options:
--pedantic display "P:" tags (normally suppressed)
--profile X Use the profile X or use vendor X checks
--show-overrides output tags that have been overridden
+ --hide-overrides do not output tags that have been overridden (default)
--suppress-tags T,... don\'t show the specified tags
--suppress-tags-from-file X don\'t show the tags listed in file X
Configuration options:
@@ -595,6 +596,7 @@ my %opthash = (
'suppress-tags-from-file=s' => \&record_suppress_tags_from_file,
'no-override|o' => \$opt{'no-override'},
'show-overrides' => \$opt{'show-overrides'},
+ 'hide-overrides' => sub { $opt{'show-overrides'} = 0; },
'color=s' => \$opt{'color'},
'unpack-info|U=s' => \@unpack_info,
'allow-root' => \$allow_root,
diff --git a/man/lintian.pod.in b/man/lintian.pod.in
index 098cd0f..39a8527 100644
--- a/man/lintian.pod.in
+++ b/man/lintian.pod.in
@@ -268,7 +268,8 @@ in the configuration file.
=item B<-o>, B<--no-override>
-Don't use the overrides file.
+Ignore all overrides provided by the package. This option will overrule
+B<--show-overrides>.
This option overrides the B<override> variable in the configuration
file.
@@ -315,14 +316,20 @@ If not specified, the default value is I<{VENDOR}/main>.
Please Refer to the Lintian User Manual for the full documentation of
profiles.
-=item B<--show-overrides>
+=item B<--show-overrides>, B<--hide-overrides>
-Output tags that have been overridden. The related override comments
-will also be printed (unless --quiet is used). Please refer to the
-Lintian User Manual for the documentation on how lintian relates
-comments to a given override.
+Controls whether tags that have been overridden should be shown.
-This option overrides the B<show-overrides> variable in the
+The B<--show-overrides> differs from B<--no-overrides> in that shown overridden
+tags will still be marked as overridden (using an "O" code).
+
+If the overridden tags are shown, the related override comments will
+also be displayed (unless --quiet is used). Please refer to the Lintian
+User Manual for the documentation on how lintian relates comments to a
+given override.
+
+
+These options override the B<show-overrides> variable in the
configuration file.
=item B<--suppress-tags> tag1,tag2,...
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
Reply to: