[SCM] Debian package checker branch, master, updated. 2.5.11-130-gaabe5eb

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

The following commit has been merged in the master branch:
commit aabe5eb8d4898dd0476a2757bb3829afdf88c8c4
Author: Niels Thykier <niels@thykier.net>
Date:   Tue Jan 29 13:06:55 2013 +0100

    lintian: Make --suppress-tags work with --check-part
    
    Change --suppress-tags so it has an affect together with --check-part
    (as "only those checks, but without these tags").  Also be explicit
    about --tags causing --supress-tags to be ignored.
    
    Signed-off-by: Niels Thykier <niels@thykier.net>

diff --git a/debian/changelog b/debian/changelog
index 11f4b3d..3a66999 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -135,6 +135,9 @@ lintian (2.5.12) UNRELEASED; urgency=low
     + [NT] Add new command line option "--[no-]user-dirs" to disable
       loading from $HOME/.lintian{rc,/} and /etc/lintian{rc,/}.
     + [NT] Error out early if a check cannot be loaded.
+    + [NT] Make --suppress-tags{,--from-file} do something when used
+      with --check-part and document that --tags causes the option
+      to be ignored.
 
   * 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 af54876..ccb8363 100755
--- a/frontend/lintian
+++ b/frontend/lintian
@@ -1598,12 +1598,6 @@ sub _update_profile {
     my ($profile, $sup_check, $sup_tags, $only_check, $only_tags) = @_;
     my %abbrev = ();
 
-    # --suppress-tags{,-from-file} can appear alone, but can also be
-    # mixed with -C or -X
-    if (%$sup_tags) {
-        $profile->disable_tags (keys %$sup_tags);
-    }
-
     if ($sup_check || $only_check) {
         # Build an abbreviation map
         for my $c ($profile->scripts (1)) {
@@ -1641,6 +1635,13 @@ sub _update_profile {
             $profile->disable_tags ($cs->tags);
         }
     }
+
+
+    # --suppress-tags{,-from-file} can appear alone, but can also be
+    # mixed with -C or -X.  Though, ignore it with --tags.
+    if (%$sup_tags and not $check_tags) {
+        $profile->disable_tags (keys %$sup_tags);
+    }
 }
 
 # }}}
diff --git a/man/lintian.pod.in b/man/lintian.pod.in
index 73675e6..87cf7c7 100644
--- a/man/lintian.pod.in
+++ b/man/lintian.pod.in
@@ -331,7 +331,15 @@ configuration file.
 =item B<--suppress-tags> tag1,tag2,...
 
 Suppress the listed tags.  They will not be reported if they occur and
-will not affect the exit status of Lintian.
+will not affect the exit status of Lintian.  This option can be given
+multiple times and can be mixed with B<--suppress-tags-from-file>.
+
+This option can be used together with B<--dont-check-part> ("Not those
+checks nor these tags") and B<--check-part> ("Only those checks, but
+not these tags (from those checks)") to further reduce the selection of
+tags.
+
+When used with B<--tags>, this option is mostly ignored.
 
 =item B<--suppress-tags-from-file> file
 
@@ -341,6 +349,9 @@ names or comma-separated lists of tag names to suppress.  The
 suppressed tags will not be reported if they occur and will not affect
 the exit status of Lintian.
 
+Tags parsed from the file will be handled as if they had been given to
+the B<--suppress-tags> option (e.g. ignored if B<--tags> is used).
+
 =item B<-U> info1,info2,..., B<--unpack-info> info1,info2,...
 
 Collect information info1, info2, etc. even if these are not required

-- 
Debian package checker