[lintian] 01/01: c/files.pm: emit dir-or-file-in-build-tree for /build + /tmp/buildd, too
This is an automated email from the git hooks/post-receive script.
abe pushed a commit to branch master
in repository lintian.
commit 1058b8223dc210816914925d8c3e9cb928076edf
Author: Mattia Rizzolo <mattia@mapreri.org>
Date: Mon Aug 31 11:40:14 2015 +0000
c/files.pm: emit dir-or-file-in-build-tree for /build + /tmp/buildd, too
Also, move the check up in the "check tree" to get this tag always emitted.
Also, emit the tag also for the top level directories themselves.
Also, add /build to the ignore list of file-in-unusual-dir
Closes: #797532
---
checks/files.pm | 22 ++++++++++++----------
debian/changelog | 3 +++
t/tests/files-foo-in-bar/debian/debian/install | 2 ++
t/tests/files-foo-in-bar/tags | 11 +++++++++++
4 files changed, 28 insertions(+), 10 deletions(-)
diff --git a/checks/files.pm b/checks/files.pm
index b816ed8..4643f26 100644
--- a/checks/files.pm
+++ b/checks/files.pm
@@ -441,8 +441,18 @@ sub run {
}
}
+ # build directory
+ if ( $fname =~ m,^var/cache/pbuilder/build/,
+ or $fname =~ m,^var/lib/sbuild/,
+ or $fname =~ m,^var/lib/buildd/,
+ or $fname =~ m,^build/,
+ or $fname =~ m,^tmp/buildd/,) {
+ unless ($source_pkg eq 'sbuild') {
+ tag 'dir-or-file-in-build-tree', $file;
+ }
+ }
# ---------------- /etc
- if ($fname =~ m,^etc/,) {
+ elsif ($fname =~ m,^etc/,) {
# /etc/apt
if ($fname =~ m,^etc/apt/,) {
# -----------------/etc/apt/preferences
@@ -952,14 +962,6 @@ sub run {
elsif ($fname =~ m,^srv/.,) {
tag 'dir-or-file-in-srv', $file;
}
- # build directory
- elsif ($fname =~ m,^var/cache/pbuilder/build/.,
- or $fname =~ m,^var/lib/sbuild/.,
- or $fname =~ m,^var/lib/buildd/.,) {
- unless ($source_pkg eq 'sbuild') {
- tag 'dir-or-file-in-build-tree', $file;
- }
- }
# ---------------- FHS directory?
elsif (
$fname =~ m,^[^/]+/$,o
@@ -1014,7 +1016,7 @@ sub run {
or $fname =~ m,^usr/iraf/,
# not allowed, but tested indivudually
or $fname =~ m{\A (?:
- home|mnt|opt|root|run|srv
+ build|home|mnt|opt|root|run|srv
|(?:(?:usr|var)/)?tmp)|var/www/}xsm
) {
tag 'file-in-unusual-dir', $file;
diff --git a/debian/changelog b/debian/changelog
index 2227afb..aefcbde 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ lintian (2.5.38) UNRELEASED; urgency=medium
XXX: generate tag summary
+ * checks/files.pm:
+ + [AB] Apply patch by Mattia Rizzolo to also check for files in /build
+ and /tmp/buildd in dir-or-file-in-build-tree. (Closes: #797532)
* checks/obsolete-sites.pm:
+ [AB] Stop at <>, $, or " when emitting URLs as tag parameter.
diff --git a/t/tests/files-foo-in-bar/debian/debian/install b/t/tests/files-foo-in-bar/debian/debian/install
index af63a20..50d65b4 100644
--- a/t/tests/files-foo-in-bar/debian/debian/install
+++ b/t/tests/files-foo-in-bar/debian/debian/install
@@ -46,6 +46,8 @@ bar etc/opt
bar var/cache/pbuilder/build
bar var/lib/sbuild
bar var/lib/buildd
+bar build/dir/foo
+bar tmp/buildd/dir/foo
bar etc/dhcp3
Bar.pm usr/lib/perl5/Foo
diff --git a/t/tests/files-foo-in-bar/tags b/t/tests/files-foo-in-bar/tags
index 488c306..3baef53 100644
--- a/t/tests/files-foo-in-bar/tags
+++ b/t/tests/files-foo-in-bar/tags
@@ -1,6 +1,17 @@
E: files-foo-in-bar: dir-in-usr-local usr/local/foo/
+E: files-foo-in-bar: dir-or-file-in-build-tree build/
+E: files-foo-in-bar: dir-or-file-in-build-tree build/dir/
+E: files-foo-in-bar: dir-or-file-in-build-tree build/dir/foo/
+E: files-foo-in-bar: dir-or-file-in-build-tree build/dir/foo/bar
+E: files-foo-in-bar: dir-or-file-in-build-tree tmp/buildd/
+E: files-foo-in-bar: dir-or-file-in-build-tree tmp/buildd/dir/
+E: files-foo-in-bar: dir-or-file-in-build-tree tmp/buildd/dir/foo/
+E: files-foo-in-bar: dir-or-file-in-build-tree tmp/buildd/dir/foo/bar
+E: files-foo-in-bar: dir-or-file-in-build-tree var/cache/pbuilder/build/
E: files-foo-in-bar: dir-or-file-in-build-tree var/cache/pbuilder/build/bar
+E: files-foo-in-bar: dir-or-file-in-build-tree var/lib/buildd/
E: files-foo-in-bar: dir-or-file-in-build-tree var/lib/buildd/bar
+E: files-foo-in-bar: dir-or-file-in-build-tree var/lib/sbuild/
E: files-foo-in-bar: dir-or-file-in-build-tree var/lib/sbuild/bar
E: files-foo-in-bar: dir-or-file-in-etc-opt etc/opt/bar
E: files-foo-in-bar: dir-or-file-in-home home/johndoe/
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
Reply to: