[lintian] 01/01: lintian: Fix regression in config file handling

[Niels Thykier <nthykier@moszumanska.debian.org>]

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

nthykier pushed a commit to branch master
in repository lintian.

commit c58543f2dc1beb39c0ca6b75ea667bd51527cfeb
Author: Niels Thykier <niels@thykier.net>
Date:   Thu Jul 16 07:18:44 2015 +0200

    lintian: Fix regression in config file handling
    
    Signed-off-by: Niels Thykier <niels@thykier.net>
---
 frontend/lintian | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/frontend/lintian b/frontend/lintian
index 80ccb48..afb1e26 100755
--- a/frontend/lintian
+++ b/frontend/lintian
@@ -658,13 +658,16 @@ import Lintian::Util qw(fail parse_boolean strip);
 sanitize_environment();
 
 # Check if we should load a config file
-if ($opt{'no-conf'}) {
+if ($opt{'no-cfg'}) {
     $opt{'LINTIAN_CFG'} = '';
 } else {
     if (not $opt{'LINTIAN_CFG'}) {
-        $opt{'LINTIAN_CFG'} = _find_cfg_file() // '';
+        $opt{'LINTIAN_CFG'} = _find_cfg_file();
+    }
+    # _find_cfg_file() can return undef
+    if ($opt{'LINTIAN_CFG'}) {
+        parse_config_file($opt{'LINTIAN_CFG'});
     }
-    parse_config_file($opt{'LINTIAN_CFG'});
 }
 
 $ENV{'TMPDIR'} = $opt{'TMPDIR'} if defined($opt{'TMPDIR'});

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