[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[lintian] 01/01: lintian: Fix regression with --tags



This is an automated email from the git hooks/post-receive script.

nthykier pushed a commit to branch master
in repository lintian.

commit 712e153add7509d815f4068f22e1bc8c72438fec
Author: Niels Thykier <niels@thykier.net>
Date:   Thu Jul 16 07:59:54 2015 +0200

    lintian: Fix regression with --tags
    
    Signed-off-by: Niels Thykier <niels@thykier.net>
---
 frontend/lintian | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/frontend/lintian b/frontend/lintian
index afb1e26..533c37f 100755
--- a/frontend/lintian
+++ b/frontend/lintian
@@ -1649,11 +1649,6 @@ sub load_profile_and_configure_tags {
     $opt{'LINTIAN_PROFILE'} = $profile->name
       unless defined($opt{'LINTIAN_PROFILE'});
     v_msg('Using profile ' . $profile->name . '.');
-
-    if ($dont_check || %suppress_tags || $checks || $check_tags) {
-        _update_profile($profile, $dont_check, \%suppress_tags, $checks,
-            $check_tags);
-    }
     Lintian::Data->set_vendor($profile);
 
     $TAGS = Lintian::Tags->new;
@@ -1662,6 +1657,11 @@ sub load_profile_and_configure_tags {
     $TAGS->sources(keys(%display_source)) if %display_source;
     $TAGS->profile($profile);
 
+    if ($dont_check || %suppress_tags || $checks || $check_tags) {
+        _update_profile($profile, $TAGS, $dont_check, \%suppress_tags, $checks,
+            $check_tags);
+    }
+
     # Initialize display level settings.
     for my $level (@display_level) {
         eval { $TAGS->display(@{$level}) };
@@ -1821,7 +1821,7 @@ sub parse_options {
 }
 
 sub _update_profile {
-    my ($profile, $sup_check, $sup_tags, $only_check, $only_tags) = @_;
+    my ($profile, $tags, $sup_check, $sup_tags, $only_check, $only_tags) = @_;
     my %abbrev = ();
 
     if ($sup_check || $only_check) {
@@ -1839,7 +1839,7 @@ sub _update_profile {
     if ($checks || $check_tags) {
         $profile->disable_tags($profile->tags);
         if ($check_tags) {
-            $TAGS->show_experimental(1);
+            $tags->show_experimental(1);
             # discard whatever is in @display_level and request
             # everything
             @display_level = ();

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git


Reply to: