[SCM] Debian package checker branch, master, updated. 2.5.10-160-gba188fa

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

The following commit has been merged in the master branch:
commit ba188fa030931ca0a012ace904ead85be6992f7c
Author: Niels Thykier <niels@thykier.net>
Date:   Fri Sep 21 22:59:59 2012 +0200

    lintian: Fix regression with --suppress-tags being ignored
    
    Signed-off-by: Niels Thykier <niels@thykier.net>

diff --git a/debian/changelog b/debian/changelog
index e925cd6..23ac3af 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -141,6 +141,9 @@ lintian (2.5.11) UNRELEASED; urgency=low
       group currently being unpacked when --verbose is given.
       (Closes: #677890)
     + [JW] Fix typo of Parallelization.
+    + [NT] Fix regression where --suppress-tags{,-from-file}
+      was ignored if -C or -X was passed.  Thanks to Thorsten
+      Glaser for reporting it.  (Closes: #688320)
 
   * lib/Lintian/Architecture.pm:
     + [NT] Properly handle cases like "linux-amd64" being an
diff --git a/frontend/lintian b/frontend/lintian
index 13f7c9b..bff772f 100755
--- a/frontend/lintian
+++ b/frontend/lintian
@@ -1625,6 +1625,12 @@ 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)) {
@@ -1661,9 +1667,6 @@ sub _update_profile {
             fail ("Unknown check script $c") unless $cs;
             $profile->disable_tags ($cs->tags);
         }
-    } elsif (%$sup_tags) {
-        # we are disabling tags
-        $profile->disable_tags (keys %$sup_tags);
     }
 }
 

-- 
Debian package checker