[SCM] Debian package checker branch, master, updated. 2.5.1-150-g7d4bc4c
The following commit has been merged in the master branch:
commit 7d4bc4c7ab14d3bf81cf7f8b26f979cf73077d1a
Author: Niels Thykier <niels@thykier.net>
Date: Tue Jul 26 20:48:11 2011 +0200
Allow verbose to appear in the lintianrc file
diff --git a/debian/changelog b/debian/changelog
index c2f5d7e..a61c62f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -196,6 +196,7 @@ lintian (2.5.2) UNRELEASED; urgency=low
+ [NT] Ensure that all dependency collections of a check are
loaded. Previously Lintian would only load direct
dependencies of a collection and assume that was enough.
+ + [NT] Allow "verbose" to appear in the lintianrc file.
* lib/Lab.pm:
+ [NT] Removed $dist argument to lab creation, since we rely on
diff --git a/frontend/lintian b/frontend/lintian
index 1f84b04..2f7f6b7 100755
--- a/frontend/lintian
+++ b/frontend/lintian
@@ -93,7 +93,6 @@ my $BANNER = "Lintian v$LINTIAN_VERSION"; #Version Banner - text form
# they were set via commandline or environment variables
my $pkg_mode = 'a'; # auto -- automatically search for
# binary and source pkgs
-my $verbose = 0; #flag for -v|--verbose switch
my $quiet = 0; #flag for -q|--quiet switch
my $debug = 0;
my $check_everything = 0; #flag for -a|--all switch
@@ -449,7 +448,7 @@ my %opthash = ( # ------------------ actions
'version|V' => \&banner,
'print-version' => \&banner,
- 'verbose|v' => \$verbose,
+ 'verbose|v' => \$opt{'verbose'},
'debug|d+' => \$debug, # Count the -d flags
'quiet|q' => \$quiet,
@@ -509,6 +508,7 @@ my %cfghash = (
'pedantic' => \$opt{'pedantic'},
'no-override' => \$opt{'no-override'},
'show-overrides' => \$opt{'show-overrides'},
+ 'verbose' => \$opt{'verbose'},
);
# init commandline parser
@@ -686,7 +686,7 @@ if ($ENV{'LINTIAN_INTERNAL_TESTSUITE'}){
@prof_inc = ();
}
-$verbose = 1 if $debug;
+$opt{'verbose'} = 1 if $debug;
$ENV{'LINTIAN_DEBUG'} = $debug;
# Use our custom-generated locale for programs we call, if it's available. We
@@ -749,7 +749,7 @@ if (defined $experimental_output_opts) {
}
-$Lintian::Output::GLOBAL->verbose($verbose);
+$Lintian::Output::GLOBAL->verbose($opt{'verbose'});
$Lintian::Output::GLOBAL->debug($debug);
$Lintian::Output::GLOBAL->quiet($quiet);
$Lintian::Output::GLOBAL->color($opt{'color'});
--
Debian package checker
Reply to: