[SCM] Debian package checker branch, master, updated. 2.5.7-19-gd11d4ab
The following commit has been merged in the master branch:
commit 514618d9b84a4198aaf7e4c3b20cc75f0cb482ee
Author: Felix Geyer <debfx-pkg@fobos.de>
Date: Wed May 23 14:41:00 2012 +0200
Check icon-size-and-directory-name-mismatch for symlinks within a package
Signed-off-by: Niels Thykier <niels@thykier.net>
diff --git a/checks/files b/checks/files
index 3a340a7..71a4232 100644
--- a/checks/files
+++ b/checks/files
@@ -26,7 +26,7 @@ use File::Basename;
use Lintian::Data;
use Lintian::Tags qw(tag);
-use Lintian::Util qw(fail);
+use Lintian::Util qw(fail resolve_pkg_path);
my $FONT_PACKAGES = Lintian::Data->new ('files/fonts', qr/\s++/);
my $TRIPLETS = Lintian::Data->new ('files/triplets', qr/\s++/);
@@ -920,7 +920,13 @@ foreach my $file (@{$info->sorted_index}) {
if ($file =~ m,/icons/[^/]+/(\d+x\d+)/(?!animations/).*\.png$,) {
my $dsize = $1;
- my $fileinfo = $info->file_info->{$file};
+ my $path;
+ if ($index_info->{type} =~ m/^l/) {
+ $path = resolve_pkg_path(dirname($file), $link);
+ } else {
+ $path = $file;
+ }
+ my $fileinfo = $info->file_info->{$path};
if ($fileinfo && $fileinfo =~ m/,\s*(\d+)\s*x\s*(\d+)\s*,/) {
my $fsize = $1.'x'.$2;
tag 'icon-size-and-directory-name-mismatch', $file, $fsize
diff --git a/t/tests/files-general/debian/debian/links b/t/tests/files-general/debian/debian/links
new file mode 100644
index 0000000..f3e425d
--- /dev/null
+++ b/t/tests/files-general/debian/debian/links
@@ -0,0 +1 @@
+usr/share/apps/lintian/icons/hicolor/22x22/lintian-22x22.png usr/share/apps/lintian/icons/hicolor/64x64/lintian-64x64.png
diff --git a/t/tests/files-general/tags b/t/tests/files-general/tags
index 329a24c..c49b862 100644
--- a/t/tests/files-general/tags
+++ b/t/tests/files-general/tags
@@ -19,6 +19,7 @@ W: files-general: executable-not-elf-or-script usr/share/man/man5/foo.5.gz
W: files-general: file-in-unusual-dir new-top-level-dir/file-in-new-top-level-dir
W: files-general: file-name-ends-in-whitespace usr/share/foo/ws
W: files-general: icon-size-and-directory-name-mismatch usr/share/apps/lintian/icons/hicolor/22x22/lintian-16x16.png 16x16
+W: files-general: icon-size-and-directory-name-mismatch usr/share/apps/lintian/icons/hicolor/64x64/lintian-64x64.png 22x22
W: files-general: icon-size-and-directory-name-mismatch usr/share/icons/hicolor/22x22/apps/lintian-16x16.png 16x16
W: files-general: obsolete-comments-style-in-php-ini etc/php5/conf.d/php-foo.ini
W: files-general: raster-image-in-scalable-directory usr/share/icons/hicolor/scalable/apps/lintian-16x16.png
--
Debian package checker
Reply to: