[SCM] Debian package checker branch, master, updated. 2.5.2-105-g83facff

["Niels Thykier" <niels@thykier.net>]

The following commit has been merged in the master branch:
commit 83facff1196dec012ceba349ced00ccaf3e18df7
Author: Niels Thykier <niels@thykier.net>
Date:   Tue Sep 6 21:54:18 2011 +0200

    Clarified some options ignore display settings
    
    Also made --tags show tags passed even if they are pedantic and
    experimental.

diff --git a/debian/changelog b/debian/changelog
index 0d46543..608642a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -160,6 +160,10 @@ lintian (2.5.3) UNRELEASED; urgency=low
     + [NT] Mention ".changes" as a valid file type in the "unknown
       file" error.  Thanks to Michael Gilbert for the report and
       the patch.   (Closes: #639430)
+    + [NT] Always display a given tag if requested with --tags
+      or --tags-from-file.  Previously, pedantic and experimental
+      tags were not shown unless the relevant options were also
+      passed.
 
   * lib/Util.pm:
     + [JW] Use LC_ALL rather than LANG, since LC_ALL overrules
@@ -196,6 +200,8 @@ lintian (2.5.3) UNRELEASED; urgency=low
 
   * man/lintian.pod.in:
     + [JW] Fixed some stray POD markup.  (Closes: #640705)
+    + [JW,NT] Clarified that some options ignores the display
+      settings.  (Closes: #640694)
 
   * profiles/debian/ftp-master-auto-reject.profile:
     + [NT] Refreshed to include udeb-uses-non-gzip-data-tarball.
diff --git a/frontend/lintian b/frontend/lintian
index dec5e2d..8a921a8 100755
--- a/frontend/lintian
+++ b/frontend/lintian
@@ -785,6 +785,12 @@ if ($no_profile) {
     # If we are given explicit list, we use that regardless
     # of show_pedantic/display.
     $TAGS->respect_display_level(0);
+    # if tags are listed explicitly (--tags) then show them even if
+    # they are pedantic/experimental.  However, for --check-part
+    # people explictly have to pass --display-experimental and
+    # --pedantic to see them (above).
+    $TAGS->show_experimental(1) if $check_tags;
+    $TAGS->show_pedantic(1) if $check_tags;
 } else {
     unless ($opt{'LINTIAN_PROFILE'}){
 	# Time to ask dpkg-vendor for a vendor name
diff --git a/man/lintian.pod.in b/man/lintian.pod.in
index c34bf3f..1711c86 100644
--- a/man/lintian.pod.in
+++ b/man/lintian.pod.in
@@ -67,6 +67,11 @@ Run only the specified checks.  You can either specify the name of the
 check script or the abbreviation.  For details, see the L</CHECKS> section
 below.
 
+With this options all normal tags from the checks will be displayed
+regardless of the display settings.  The pedantic and experimental
+tags from this given checks are only displayed if the relevant options
+are passed as well.  (see B<--pedantic> and B<--display-experimental>)
+
 Note: This option skips profile loading, even if B<--profile> was passed.
 
 =item B<-F>, B<--ftp-master-rejects>
@@ -99,6 +104,9 @@ Run only the checks that issue the requested tags.  The tests for
 other tags within the check scripts will be run but the tags will not
 be issued.
 
+With this options all tags listed will be displayed regardless of the
+display settings.
+
 Note: This option skips profile loading, even if B<--profile> was passed.
 
 =item B<--tags-from-file> filename
@@ -108,6 +116,9 @@ file.  Blank lines and lines beginning with # are ignored.  All other
 lines are taken to be tag names or comma-separated lists of tag names
 to (potentially) issue.
 
+With this options all tags listed will be displayed regardless of the
+display settings.
+
 Note: This option skips profile loading, even if B<--profile> was passed.
 
 =item B<-u>, B<--unpack>

-- 
Debian package checker