[lintian] 01/01: Fix detection of sources.list files
This is an automated email from the git hooks/post-receive script.
broucaries-guest pushed a commit to branch master
in repository lintian.
commit b85c0c27878a641c15b5cfa8e51b71b4987b7ac3
Author: Bastien ROUCARIÈS <roucaries.bastien+debian@gmail.com>
Date: Tue Jul 21 22:19:34 2015 +0200
Fix detection of sources.list files
---
checks/files.desc | 5 +++--
checks/files.pm | 4 ++--
debian/changelog | 2 ++
t/tests/files-foo-in-bar/debian/debian/install | 4 ++--
t/tests/files-foo-in-bar/tags | 4 ++--
5 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/checks/files.desc b/checks/files.desc
index 10fed55..ca283ec 100644
--- a/checks/files.desc
+++ b/checks/files.desc
@@ -90,8 +90,9 @@ Info: Debian packages should not install files under <tt>/etc/apt/preferences.d/
Tag: package-install-apt-sources
Severity: serious
Certainty: possible
-Ref: apt_sources(5)
-Info: Debian packages should not install files under <tt>/etc/apt/sources.d/</tt> or install a /etc/apt/sources file.
+Ref: sources.list(5)
+Info: Debian packages should not install files under <tt>/etc/apt/sources.list.d/</tt>
+ or install a /etc/apt/sources.list file.
This directory is under the control of the local administrator.
.
Package should not override local administrator choices.
diff --git a/checks/files.pm b/checks/files.pm
index f309117..19b4e13 100644
--- a/checks/files.pm
+++ b/checks/files.pm
@@ -444,13 +444,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-install-apt-preferences', $file;
}
}
# -----------------/etc/apt/sources
- if ($fname =~ m,^etc/apt/sources(?:\.d/)?,) {
+ if ($fname =~ m,^etc/apt/sources\.list(?:$|\.d/),) {
unless ($source_pkg eq 'apt') {
tag 'package-install-apt-sources', $file;
}
diff --git a/debian/changelog b/debian/changelog
index cadc535..e678bec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,8 @@ lintian (2.5.34) UNRELEASED; urgency=medium
Thanks to Andreas Beckmann for the report.
(Closes: #793068)
+ [BR] Detect pdf, ps, and eps lenna file.
+ * checks/files.{desc,pm}:
+ + [BR] Fix detection of sources.list file. (Closes: #792237)
* checks/systemd.pm:
+ [NT] Apply patches from Felipe Sateler to ignore known
masked init.d scripts. (Closes: #792501)
diff --git a/t/tests/files-foo-in-bar/debian/debian/install b/t/tests/files-foo-in-bar/debian/debian/install
index eeb349d..af63a20 100644
--- a/t/tests/files-foo-in-bar/debian/debian/install
+++ b/t/tests/files-foo-in-bar/debian/debian/install
@@ -1,7 +1,7 @@
bar bin/foo
bar emul
bar etc/apt/preferences.d
-bar etc/apt/sources.d
+bar etc/apt/sources.list.d
bar etc/gconf/schemas/
bar etc/rc.boot
bar etc/rc.d
@@ -53,4 +53,4 @@ bar.png usr/lib/files-foo-in-bar
perllocal.pod usr/lib/perl-foo
.packlist usr/lib/perl5
-preferences etc/apt
\ No newline at end of file
+preferences etc/apt
diff --git a/t/tests/files-foo-in-bar/tags b/t/tests/files-foo-in-bar/tags
index fb87efc..650de90 100644
--- a/t/tests/files-foo-in-bar/tags
+++ b/t/tests/files-foo-in-bar/tags
@@ -35,8 +35,8 @@ E: files-foo-in-bar: package-contains-xvpics-dir usr/share/doc/files-foo-in-bar/
E: files-foo-in-bar: package-install-apt-preferences etc/apt/preferences
E: files-foo-in-bar: package-install-apt-preferences etc/apt/preferences.d/
E: files-foo-in-bar: package-install-apt-preferences etc/apt/preferences.d/bar
-E: files-foo-in-bar: package-install-apt-sources etc/apt/sources.d/
-E: files-foo-in-bar: package-install-apt-sources etc/apt/sources.d/bar
+E: files-foo-in-bar: package-install-apt-sources etc/apt/sources.list.d/
+E: files-foo-in-bar: package-install-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/
E: files-foo-in-bar: package-installs-file-to-usr-x11r6 usr/X11R6/bin/bar
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
Reply to: