[lintian] 01/01: Fix package-contains-mime-file-outside-package-dir
This is an automated email from the git hooks/post-receive script.
broucaries-guest pushed a commit to branch master
in repository lintian.
commit 0aa0b857d679654c2d1d783fd1c6cdffd9e599f3
Author: bastien <roucaries.bastien+debian@gmail.com>
Date: Mon Jun 15 23:55:44 2015 +0200
Fix package-contains-mime-file-outside-package-dir
Signed-off-by: bastien <roucaries.bastien+debian@gmail.com>
---
checks/files.pm | 9 ++++-----
t/tests/files-foo-in-bar/debian/debian/install | 2 +-
t/tests/files-foo-in-bar/desc | 1 +
t/tests/files-foo-in-bar/tags | 3 ++-
4 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/checks/files.pm b/checks/files.pm
index 4832926..1b3275d 100644
--- a/checks/files.pm
+++ b/checks/files.pm
@@ -740,7 +740,10 @@ sub run {
}
# ---------------- /usr/share/mime/
elsif ($fname=~ m,^usr/share/mime/.+,) {
- unless ($fname=~ m,^usr/share/mime/packages(?:$|/),) {
+ # ---------------- /usr/share/mime
+ if ($fname =~ m,^usr/share/mime/[^/]+$,) {
+ tag 'package-contains-mime-cache-file', $file;
+ }elsif ($fname!~ m,^usr/share/mime/packages/,) {
tag 'package-contains-mime-file-outside-package-dir',$file;
}
}
@@ -785,10 +788,6 @@ sub run {
elsif ($fname =~ m,^usr/share/linda/overrides/\S+,) {
tag 'package-contains-linda-override', $file;
}
- # ---------------- /usr/share/mime
- elsif ($fname =~ m,^usr/share/mime/[^/]+$,) {
- tag 'package-contains-mime-cache-file', $file;
- }
# ---------------- /usr/share/p11-kit/modules
elsif (
$fname =~ m{^usr/share/p11-kit/modules/.}
diff --git a/t/tests/files-foo-in-bar/debian/debian/install b/t/tests/files-foo-in-bar/debian/debian/install
index 70e0c8f..eeb349d 100644
--- a/t/tests/files-foo-in-bar/debian/debian/install
+++ b/t/tests/files-foo-in-bar/debian/debian/install
@@ -29,7 +29,7 @@ bar usr/share/doc
bar usr/share/doc/files-foo-in-bar/.xvpics/
bar usr/share/doc/files-foo-in-bar/.thumbnails/
bar usr/share/doc/files-foo-in-bar/examples/examples
-bar usr/share/mime/
+bar usr/share/mime/foo/
bar usr/share/mime/packages/
bar usr/share/perl/
bar usr/share/vim/vimcurrent/
diff --git a/t/tests/files-foo-in-bar/desc b/t/tests/files-foo-in-bar/desc
index 79dad41..4e0c2b6 100644
--- a/t/tests/files-foo-in-bar/desc
+++ b/t/tests/files-foo-in-bar/desc
@@ -22,6 +22,7 @@ Test-For:
image-file-in-usr-lib
non-multi-arch-lib-dir
non-standard-toplevel-dir
+ package-contains-mime-file-outside-package-dir
package-contains-xvpics-dir
package-contains-thumbnails-dir
package-installs-file-to-usr-x11r6
diff --git a/t/tests/files-foo-in-bar/tags b/t/tests/files-foo-in-bar/tags
index b6b8574..fb87efc 100644
--- a/t/tests/files-foo-in-bar/tags
+++ b/t/tests/files-foo-in-bar/tags
@@ -28,7 +28,8 @@ E: files-foo-in-bar: file-in-usr-local usr/local/foo/bar
E: files-foo-in-bar: nested-examples-directory usr/share/doc/files-foo-in-bar/examples/examples/
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-mime-file-outside-package-dir usr/share/mime/bar
+E: files-foo-in-bar: package-contains-mime-file-outside-package-dir usr/share/mime/foo/
+E: files-foo-in-bar: package-contains-mime-file-outside-package-dir usr/share/mime/foo/bar
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-install-apt-preferences etc/apt/preferences
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
Reply to: