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

[SCM] Debian package checker branch, master, updated. 2.5.11-221-g96e3122



The following commit has been merged in the master branch:
commit 96e31225aad3e6f4aad9d245b988a03c22ff3cc2
Author: Niels Thykier <niels@thykier.net>
Date:   Wed Apr 3 23:38:37 2013 +0200

    c/menu-format: Remove leading slash in argument to unpacked
    
    The documentation of "unpacked" says that the argument "should be
    without leading slash".
    
    Signed-off-by: Niels Thykier <niels@thykier.net>

diff --git a/checks/menu-format b/checks/menu-format
index 4a9eddb..1849236 100644
--- a/checks/menu-format
+++ b/checks/menu-format
@@ -539,14 +539,14 @@ sub verify_icon {
     # Try the explicit location, and if that fails, try the standard path.
     my $iconfile = $info->unpacked($icon);
     if (! -f $iconfile) {
-        $iconfile = $info->unpacked("/usr/share/pixmaps/$icon");
+        $iconfile = $info->unpacked("usr/share/pixmaps/$icon");
         if (! -f $iconfile) {
             my $ginfo = $group->info;
             foreach my $depproc (@{ $ginfo->direct_dependencies ($proc) }) {
                 my $dinfo = $depproc->info;
                 $iconfile = $dinfo->unpacked($icon);
                 last if -f $iconfile;
-                $iconfile = $info->unpacked("/usr/share/pixmaps/$icon");
+                $iconfile = $info->unpacked("usr/share/pixmaps/$icon");
                 last if -f $iconfile;
             }
         }

-- 
Debian package checker


Reply to: