[SCM] Debian package checker branch, master, updated. 2.5.6-35-gee869db

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

The following commit has been merged in the master branch:
commit ee869db1426eec05ce015d71e9f3dbf905bb8a28
Author: Niels Thykier <niels@thykier.net>
Date:   Thu Mar 29 22:24:11 2012 +0200

    lintian: Fix handling of the "override" cfg option
    
    Signed-off-by: Niels Thykier <niels@thykier.net>

diff --git a/debian/changelog b/debian/changelog
index 3e97ee4..adcd765 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -65,6 +65,8 @@ lintian (2.5.7) UNRELEASED; urgency=low
 
   * frontend/lintian:
     + [JW] Fix typo in error message.
+    + [JW,NT] Fix handling of "override" option in the lintianrc file.
+      (Closes: #666207)
 
   * lib/Lintian/Architecture.pm:
     + [NT] Lazily evaluate the data file.
diff --git a/frontend/lintian b/frontend/lintian
index 50bbf82..92dd9e9 100755
--- a/frontend/lintian
+++ b/frontend/lintian
@@ -465,6 +465,14 @@ sub cfg_verbosity {
     $opt{'verbose'} = $val;
 }
 
+# Process overrides option in the cfg files
+sub cfg_override {
+    my ($var, $val) = @_;
+    return if defined $opt{'no-override'};
+    # This option is inverted in the config file
+    $opt{'no-override'} = !$val;
+}
+
 # Hash used to process commandline options
 my %opthash = (                 # ------------------ actions
                'setup-lab|S' => \&record_action,
@@ -539,7 +547,7 @@ my %cfghash = (
                'info'                 => \$opt{'info'},
                'pedantic'             => \&cfg_display_level,
                'quiet'                => \&cfg_verbosity,
-               'no-override'          => \$opt{'no-override'},
+               'override'             => \&cfg_override,
                'show-overrides'       => \$opt{'show-overrides'},
                'verbose'              => \&cfg_verbosity,
     );
diff --git a/man/lintian.pod.in b/man/lintian.pod.in
index 1c93aa6..030ee6b 100644
--- a/man/lintian.pod.in
+++ b/man/lintian.pod.in
@@ -285,7 +285,7 @@ in changes files.  As of 2.5.1, Lintian always does this.
 
 Don't use the overrides file.
 
-This option overrides the B<overrides> variable in the configuration
+This option overrides the B<override> variable in the configuration
 file.
 
 =item B<--pedantic>

-- 
Debian package checker