[lintian] 01/01: dplint: Correct order of @RESTRICTED_INCLUDE_DIRS
This is an automated email from the git hooks/post-receive script.
nthykier pushed a commit to branch master
in repository lintian.
commit 483b31108ecceb090d1ce429c6a5fe2ab0630691
Author: Niels Thykier <niels@thykier.net>
Date: Sun Oct 8 07:08:17 2017 +0000
dplint: Correct order of @RESTRICTED_INCLUDE_DIRS
Signed-off-by: Niels Thykier <niels@thykier.net>
---
debian/changelog | 3 +++
frontend/dplint | 6 +++---
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index f1e8183..1ff55b7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -64,6 +64,9 @@ lintian (2.5.55) UNRELEASED; urgency=medium
user profiles and data files. It was advertised as such in the
documentation but the code actually only used the XDG_DATA_HOME
path. Thanks to Daniel Kauffman for the report. (Closes: #875636)
+ + [NT] Correct the order of restricted search paths (user directories
+ and /etc/lintian). It incorrectly used /etc/lintian before the
+ user directory.
* lib/Lintian/Util.pm:
+ [NT] Rename the "fail" subroutine to "internal_error" to better
diff --git a/frontend/dplint b/frontend/dplint
index 988c32b..e36281f 100755
--- a/frontend/dplint
+++ b/frontend/dplint
@@ -138,11 +138,11 @@ sub setup_env {
my $cwd = getcwd();
$data_home = "${cwd}/${data_home}";
}
- unshift(@RESTRICTED_INCLUDE_DIRS, $data_home)
+ push(@RESTRICTED_INCLUDE_DIRS, $data_home)
if defined($data_home) && -d $data_home;
- unshift(@RESTRICTED_INCLUDE_DIRS, $legacy_user_data)
+ push(@RESTRICTED_INCLUDE_DIRS, $legacy_user_data)
if defined($legacy_user_data) && -d $legacy_user_data;
- unshift(@RESTRICTED_INCLUDE_DIRS, '/etc/lintian')
+ push(@RESTRICTED_INCLUDE_DIRS, '/etc/lintian')
if -d '/etc/lintian';
}
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
Reply to: