[SCM] Debian package checker branch, master, updated. 2.5.11-237-g5a2b0db

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

The following commit has been merged in the master branch:
commit 5a2b0db7c459b71b41f606fe0b79dfc303ee32f2
Author: Niels Thykier <niels@thykier.net>
Date:   Thu Apr 11 19:34:11 2013 +0200

    lintian: Make --root imply --no-user-dirs by default
    
    Make the use of --root (or LINTIAN_ROOT) imply --no-user-dirs.
    
    Signed-off-by: Niels Thykier <niels@thykier.net>

diff --git a/debian/changelog b/debian/changelog
index de240a8..78ef2d0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -209,6 +209,8 @@ lintian (2.5.12) UNRELEASED; urgency=low
       still accepted.
     + [NT] Stop looking for lintianrc files in the LINTIAN_ROOT.
     + [NT] Stop exporting LINTIAN_LAB to processes run by lintian.
+    + [NT] Use of --root (or setting LINTIAN_ROOT) will now imply
+      the option --no-user-dirs by default.
 
   * lib/*:
     + [NT] Use "parent" instead of the "base" pragma.
diff --git a/frontend/lintian b/frontend/lintian
index eac142d..7eeb2a6 100755
--- a/frontend/lintian
+++ b/frontend/lintian
@@ -86,8 +86,6 @@ my %conf_opt;                   #names of options set in the cfg file
 
 my %opt = (                     #hash of some flags from cmd or cfg
                                 # Init some cmd-line value defaults
-    # Allow user-dirs ($HOME/.lintian + /etc/lintian) by default
-    'user-dirs' => 1,
 );
 
 # The search path - affected by --include-dir X, --[no-]user-dirs
@@ -559,8 +557,13 @@ if (defined $opt{'LINTIAN_ROOT'}) {
         }
         $opt{'LINTIAN_ROOT'} = $resolved;
     }
+    # --root/$ENV{LINTIAN_ROOT} implies --no-user-dirs (but allow
+    # the users to explicitly override that if they so desire)
+    $opt{'user-dirs'} //= 0;
 } else {
     $opt{'LINTIAN_ROOT'} = '/usr/share/lintian';
+    # Enable user dirs by default
+    $opt{'user-dirs'} //= 1;
 }
 # exported for collections, which are run as an external process.
 $ENV{'LINTIAN_ROOT'} = $opt{'LINTIAN_ROOT'};
diff --git a/man/lintian.pod.in b/man/lintian.pod.in
index 6ff04a6..2b90902 100644
--- a/man/lintian.pod.in
+++ b/man/lintian.pod.in
@@ -458,6 +458,8 @@ This option is mostly useful for development or testing of B<lintian>.
 To add additional support files (e.g. extra checks), consider using
 B<--include-dir> instead.
 
+This option implies B<--no-user-dirs>.
+
 =item B<--user-dirs>, B<--no-user-dirs>
 
 By default, B<lintian> will check I<$HOME> and I</etc> for files
@@ -601,7 +603,9 @@ Utility scripts used by the other lintian scripts.
 =back
 
 The I</usr/share/lintian> directory can be overridden with the
-B<LINTIAN_ROOT> environment variable or the B<--root> option.
+B<LINTIAN_ROOT> environment variable or the B<--root> option.  Note
+that setting the B<LINTIAN_ROOT> environment variable will imply
+B<--no-user-dirs>.
 
 For binary packages, Lintian looks for overrides in a file named
 I<usr/share/lintian/overrides/E<lt>packageE<gt>> inside the binary

-- 
Debian package checker