[SCM] Debian package checker branch, master, updated. 2.5.0-rc2-15-gd399c96
The following commit has been merged in the master branch:
commit d399c96fae23e705721bd02bbb6686055847aef8
Author: Niels Thykier <niels@thykier.net>
Date: Sun Apr 10 15:47:42 2011 +0200
Added test for dir-or-file-in-run and made /run a "usual dir"
diff --git a/checks/files b/checks/files
index adcc0af..bc0545e 100644
--- a/checks/files
+++ b/checks/files
@@ -658,8 +658,8 @@ foreach my $file (@{$info->sorted_index}) {
tag 'dir-or-file-in-srv', $file;
}
# ---------------- FHS directory?
- elsif ($file =~ m,^[^/]+/$, and
- $file !~ m,^(?:bin|boot|dev|etc|home|lib(?:64|32)?|mnt|opt|root|sbin|selinux|srv|sys|tmp|usr|var)/,) {
+ elsif ($file =~ m,^[^/]+/$,o and
+ $file !~ m,^(?:bin|boot|dev|etc|home|lib(?:64|32)?|mnt|opt|root|run|sbin|selinux|srv|sys|tmp|usr|var)/,o) {
# Make an exception for the base-files package here and other similar
# packages because they install a slew of top-level directories for
# setting up the base system. (Specifically, /cdrom, /floppy,
@@ -700,7 +700,7 @@ foreach my $file (@{$info->sorted_index}) {
or $file =~ m,^usr/[^/]+-linux[^/]*/,
or $file =~ m,^usr/iraf/,
# not allowed, but tested indivudually
- or $file =~ m,^(?:mnt|opt|srv|(?:(?:usr|var)/)?tmp)|var/www/,) {
+ or $file =~ m,^(?:mnt|opt|run|srv|(?:(?:usr|var)/)?tmp)|var/www/,) {
tag 'file-in-unusual-dir', $file;
}
}
diff --git a/t/tests/files-foo-in-bar/debian/debian/install b/t/tests/files-foo-in-bar/debian/debian/install
index e37c2d2..14646e2 100644
--- a/t/tests/files-foo-in-bar/debian/debian/install
+++ b/t/tests/files-foo-in-bar/debian/debian/install
@@ -1,6 +1,7 @@
bar bin/foo
bar etc/udev/rules.d
bar mnt/foo
+bar run/foo
bar srv/foo
bar tmp/foo
bar usr/bin/foo
diff --git a/t/tests/files-foo-in-bar/desc b/t/tests/files-foo-in-bar/desc
index b4498e1..5c235b6 100644
--- a/t/tests/files-foo-in-bar/desc
+++ b/t/tests/files-foo-in-bar/desc
@@ -5,6 +5,7 @@ Description: Test tags about files or dirs in given paths
Test-For:
dir-in-usr-local
dir-or-file-in-mnt
+ dir-or-file-in-run
dir-or-file-in-srv
dir-or-file-in-tmp
dir-or-file-in-var-lock
diff --git a/t/tests/files-foo-in-bar/tags b/t/tests/files-foo-in-bar/tags
index 177c1b5..38c342b 100644
--- a/t/tests/files-foo-in-bar/tags
+++ b/t/tests/files-foo-in-bar/tags
@@ -1,6 +1,8 @@
E: files-foo-in-bar: dir-in-usr-local usr/local/foo/
E: files-foo-in-bar: dir-or-file-in-mnt mnt/foo/
E: files-foo-in-bar: dir-or-file-in-mnt mnt/foo/bar
+E: files-foo-in-bar: dir-or-file-in-run run/foo/
+E: files-foo-in-bar: dir-or-file-in-run run/foo/bar
E: files-foo-in-bar: dir-or-file-in-srv srv/foo/
E: files-foo-in-bar: dir-or-file-in-srv srv/foo/bar
E: files-foo-in-bar: dir-or-file-in-tmp tmp/foo/
--
Debian package checker
Reply to: