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

[SCM] Debian package checker branch, vendor-profile, updated. 2.5.1-38-g27b095a



The following commit has been merged in the vendor-profile branch:
commit cacac76d842ddf4a5beec75b892a6a40f704313e
Author: Niels Thykier <niels@thykier.net>
Date:   Thu Jun 23 16:36:05 2011 +0200

    Skip loading profiles with certain options
    
    With --tags and the likes, loading a profile does not make a lot
    of sense (at least not in terms of decided which tags which
    should be displayed)

diff --git a/frontend/lintian b/frontend/lintian
index d66e315..b42299a 100755
--- a/frontend/lintian
+++ b/frontend/lintian
@@ -64,6 +64,7 @@ our $LINTIAN_ROOT;		#location of the lintian modules
 my $no_conf = 0;                #flag for --no-cfg
 my %opt;                        #hash of some flags from cmd or cfg
 my %conf_opt;                   #names of options set in the cfg file
+my $no_profile = 0;             #whether a profile should be loaded
 
 # The profile search path except LINTIAN_ROOT/profiles
 #  which will be added later (we dont know LINTIAN_ROOT
@@ -233,6 +234,7 @@ sub record_check_part {
     }
     $action = 'check';
     $checks = "$_[1]";
+    $no_profile = 1;
 }
 
 # Record Parts requested for checking
@@ -252,6 +254,7 @@ sub record_check_tags {
     }
     $action = 'check';
     $check_tags = "$_[1]";
+    $no_profile = 1;
 }
 
 # Record Parts requested for checking
@@ -735,7 +738,7 @@ $TAGS->sources(keys %display_source) if %display_source;
 $TAGS->only(split(/,/, $check_tags)) if defined $check_tags;
 $TAGS->suppress(keys %suppress_tags) if %suppress_tags;
 
-if (defined $check_tags) {
+if ($no_profile) {
     # No profile if we have been given explicit list
     $LINTIAN_PROFILE = '';
     # If we are given explicit list, we use that regardless
diff --git a/man/lintian.pod.in b/man/lintian.pod.in
index da2ffff..842c4ba 100644
--- a/man/lintian.pod.in
+++ b/man/lintian.pod.in
@@ -67,6 +67,8 @@ 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.
 
+Note: This option skips profile loading, even if B<--profile> was passed.
+
 =item B<-F>, B<--ftp-master-rejects>
 
 Run only the checks that issue tags that result in automatic rejects
@@ -94,6 +96,8 @@ 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.
 
+Note: This option skips profile loading, even if B<--profile> was passed.
+
 =item B<--tags-from-file> filename
 
 Same functionality as B<--tags>, but read the list of tags from a
@@ -101,6 +105,8 @@ 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.
 
+Note: This option skips profile loading, even if B<--profile> was passed.
+
 =item B<-u>, B<--unpack>
 
 Unpacks the package will all collections.  See the L</COLLECTION>

-- 
Debian package checker


Reply to: