[lintian] 01/01: Do not report duplicates for package-installs-apt-preferences
This is an automated email from the git hooks/post-receive script.
broucaries-guest pushed a commit to branch master
in repository lintian.
commit e708ad536fd2b24a788d74dfb99ddfad8802148e
Author: Bastien ROUCARIÈS <roucaries.bastien+debian@gmail.com>
Date: Fri Dec 30 17:47:03 2016 +0100
Do not report duplicates for package-installs-apt-preferences
closes: #814521
Signed-off-by: Bastien ROUCARIÈS <roucaries.bastien+debian@gmail.com>
---
checks/files.pm | 4 ++--
debian/changelog | 3 +++
t/tests/files-foo-in-bar/tags | 2 --
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/checks/files.pm b/checks/files.pm
index 50b6381..7f9e912 100644
--- a/checks/files.pm
+++ b/checks/files.pm
@@ -458,13 +458,13 @@ sub run {
# /etc/apt
if ($fname =~ m,^etc/apt/,) {
# -----------------/etc/apt/preferences
- if ($fname =~ m,^etc/apt/preferences(?:$|\.d/),) {
+ if ($fname =~ m,^etc/apt/preferences(?:$|\.d/[^/]+),) {
unless ($source_pkg eq 'apt') {
tag 'package-installs-apt-preferences', $file;
}
}
# -----------------/etc/apt/sources
- if ($fname =~ m,^etc/apt/sources\.list(?:$|\.d/),) {
+ if ($fname =~ m,^etc/apt/sources\.list(?:$|\.d/[^/]+),) {
unless ($source_pkg eq 'apt') {
tag 'package-installs-apt-sources', $file;
}
diff --git a/debian/changelog b/debian/changelog
index 3108c1d..ee32882 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,9 @@ lintian (2.5.51) UNRELEASED; urgency=medium
* checks/cruft.desc:
+ [BR] Document long line tagged source-is-missing as a feature
not a bug. (Closes: #849470).
+ * checks/files.pm:
+ + [BR] Do not report duplicates for package-installs-apt-preferences
+ and package-installs-apt-sources. (Closes: #814521).
-- Bastien Roucariès <roucaries.bastien+debian@gmail.com> Fri, 30 Dec 2016 17:14:54 +0100
diff --git a/t/tests/files-foo-in-bar/tags b/t/tests/files-foo-in-bar/tags
index 87b3bc4..9990fb6 100644
--- a/t/tests/files-foo-in-bar/tags
+++ b/t/tests/files-foo-in-bar/tags
@@ -48,9 +48,7 @@ E: files-foo-in-bar: package-contains-mime-file-outside-package-dir usr/share/mi
E: files-foo-in-bar: package-contains-thumbnails-dir usr/share/doc/files-foo-in-bar/.thumbnails/
E: files-foo-in-bar: package-contains-xvpics-dir usr/share/doc/files-foo-in-bar/.xvpics/
E: files-foo-in-bar: package-installs-apt-preferences etc/apt/preferences
-E: files-foo-in-bar: package-installs-apt-preferences etc/apt/preferences.d/
E: files-foo-in-bar: package-installs-apt-preferences etc/apt/preferences.d/bar
-E: files-foo-in-bar: package-installs-apt-sources etc/apt/sources.list.d/
E: files-foo-in-bar: package-installs-apt-sources etc/apt/sources.list.d/bar
E: files-foo-in-bar: package-installs-file-to-usr-x11r6 usr/X11R6/
E: files-foo-in-bar: package-installs-file-to-usr-x11r6 usr/X11R6/bin/
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
Reply to: