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

[SCM] Debian package checker branch, vendor-profile, updated. 2.5.0-31-g3fb96b0



The following commit has been merged in the vendor-profile branch:
commit 3fb96b04f93e1196b2a78ca306e4a53f984299d7
Author: Niels Thykier <niels@thykier.net>
Date:   Tue May 31 21:46:16 2011 +0200

    Made --ftp-master-rejects an alias for the profile

diff --git a/frontend/lintian b/frontend/lintian
index 9524238..b5f4369 100755
--- a/frontend/lintian
+++ b/frontend/lintian
@@ -473,6 +473,10 @@ if ($action =~ /^(?:check|unpack|remove)$/ and $#ARGV == -1 and not $check_every
     syntax();
 }
 
+die "Cannot use profile together wtih --ftp-master-rejects.\n" if $OPT_LINTIAN_PROFILE and $ftpmaster_tags;
+# --ftp-master-rejects is implemented in a profile
+$OPT_LINTIAN_PROFILE = 'debian/ftp-master-auto-reject' if $ftpmaster_tags;
+
 # }}}
 
 # {{{ Setup Configuration
@@ -628,14 +632,6 @@ $Lintian::Output::GLOBAL->quiet($quiet);
 $Lintian::Output::GLOBAL->color($color);
 $Lintian::Output::GLOBAL->showdescription($lintian_info);
 
-# Now that we can load the data, process the -F or --ftp-master-rejects
-# option.
-if ($ftpmaster_tags) {
-    my $fatal = Lintian::Data->new('output/ftp-master-fatal');
-    my $nonfatal = Lintian::Data->new('output/ftp-master-nonfatal');
-    $check_tags = join(',', $fatal->all, $nonfatal->all);
-}
-
 # Print Debug banner, now that we're finished determining
 # the values and have Lintian::Output available
 debug_msg(1,

-- 
Debian package checker


Reply to: