From 3bc05b3de27ea5be06246dc66e0728ded75a0068 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= Date: Sun, 25 Aug 2013 21:10:30 +0200 Subject: [PATCH 2/2] Does not allow /emul Multiarch used /emul. Now it does not need /emul so warm about it. --- checks/files.pm | 3 --- t/tests/files-foo-in-bar/debian/debian/install | 1 + t/tests/files-foo-in-bar/desc | 1 + t/tests/files-foo-in-bar/tags | 2 ++ 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/checks/files.pm b/checks/files.pm index d0f83ae..d9858d5 100644 --- a/checks/files.pm +++ b/checks/files.pm @@ -780,9 +780,6 @@ sub run { $pkg =~ /^libc6-/) { tag 'non-multi-arch-lib-dir', $file; } - } elsif ($file =~ m,^emul/,) { - # Make an exception for /emul, which is used for multi-arch - # support in Debian at the moment. } else { unless ($pkg eq 'base-files' or $pkg eq 'hurd' or diff --git a/t/tests/files-foo-in-bar/debian/debian/install b/t/tests/files-foo-in-bar/debian/debian/install index 057c19d..9594883 100644 --- a/t/tests/files-foo-in-bar/debian/debian/install +++ b/t/tests/files-foo-in-bar/debian/debian/install @@ -1,4 +1,5 @@ bar bin/foo +bar emul bar etc/gconf/schemas/ bar etc/rc.boot bar etc/rc.d diff --git a/t/tests/files-foo-in-bar/desc b/t/tests/files-foo-in-bar/desc index 6e03a3a..d2a4d18 100644 --- a/t/tests/files-foo-in-bar/desc +++ b/t/tests/files-foo-in-bar/desc @@ -21,6 +21,7 @@ Test-For: file-in-usr-local image-file-in-usr-lib non-multi-arch-lib-dir + non-standard-toplevel-dir package-contains-xvpics-dir package-installs-file-to-usr-x11r6 package-installs-into-etc-gconf-schemas diff --git a/t/tests/files-foo-in-bar/tags b/t/tests/files-foo-in-bar/tags index 4be63bc..e1b3589 100644 --- a/t/tests/files-foo-in-bar/tags +++ b/t/tests/files-foo-in-bar/tags @@ -33,6 +33,7 @@ E: files-foo-in-bar: non-multi-arch-lib-dir usr/lib32/ E: files-foo-in-bar: non-multi-arch-lib-dir usr/lib64/ E: files-foo-in-bar: non-multi-arch-lib-dir usr/libx32/ E: files-foo-in-bar: non-standard-dir-in-var var/foo/ +E: files-foo-in-bar: non-standard-toplevel-dir emul/ E: files-foo-in-bar: package-contains-xvpics-dir usr/share/doc/files-foo-in-bar/.xvpics/ 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/ @@ -54,6 +55,7 @@ E: files-foo-in-bar: udev-rule-in-etc etc/udev/rules.d/bar W: files-foo-in-bar: debug-package-should-be-named-dbg usr/lib/debug/bar W: files-foo-in-bar: executable-not-elf-or-script bin/foo/bar W: files-foo-in-bar: executable-not-elf-or-script usr/bin/foo/bar +W: files-foo-in-bar: file-in-unusual-dir emul/bar W: files-foo-in-bar: file-in-unusual-dir usr/foo/bar W: files-foo-in-bar: file-in-unusual-dir usr/local/foo/bar W: files-foo-in-bar: file-in-unusual-dir var/cache/pbuilder/build/bar -- 1.7.10.4