[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] Debian package checker branch, master, updated. 2.5.7-19-gd11d4ab



The following commit has been merged in the master branch:
commit cd40049df2f9da6c74ec7487ab32b0317af76036
Author: Felix Geyer <debfx-pkg@fobos.de>
Date:   Wed May 23 14:22:44 2012 +0200

    Don't emit invalid icon-size-and-directory-name-mismatch tags for symlinks
    
    Check if file_info exists for the file and matches the regular expression.
    
    Signed-off-by: Niels Thykier <niels@thykier.net>

diff --git a/checks/files b/checks/files
index 70d62a1..3a340a7 100644
--- a/checks/files
+++ b/checks/files
@@ -919,11 +919,13 @@ foreach my $file (@{$info->sorted_index}) {
     }
 
     if ($file =~ m,/icons/[^/]+/(\d+x\d+)/(?!animations/).*\.png$,) {
-        my ($dsize, $fsize) = ($1);
-        $info->file_info->{$file} =~ m/,\s*(\d+)\s*x\s*(\d+)\s*,/;
-        $fsize = $1.'x'.$2;
-        tag 'icon-size-and-directory-name-mismatch', $file, $fsize
-            unless ($dsize eq $fsize);
+        my $dsize = $1;
+        my $fileinfo = $info->file_info->{$file};
+        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
+                unless ($dsize eq $fsize);
+        }
     }
 
     if ($file =~ m,/icons/[^/]+/scalable/.*\.(?:png|xpm)$,) {

-- 
Debian package checker


Reply to: