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

[SCM] Debian package checker branch, infra-513663, updated. 2.5.0-rc1-135-gbe7c4ef



The following commit has been merged in the infra-513663 branch:
commit 2c300c46dde8579374a0e1e1af0a197312530b9e
Author: Niels Thykier <niels@thykier.net>
Date:   Mon Apr 11 20:32:37 2011 +0200

    Fix broken symlink check to correctly handle symlinks to dirs

diff --git a/checks/symlinks b/checks/symlinks
index ce897a8..921ed3a 100644
--- a/checks/symlinks
+++ b/checks/symlinks
@@ -60,12 +60,15 @@ foreach my $file (@{$info->sorted_index}) {
             next;
         }
 
+	# Check if the desstination is in the package itself
+        next if $index->{$mylink} || $index->{"$mylink/"};
+
         # Ignore links pointing to common things that may exist
         # even if they are not shipped by any binary from this
         # source package.
         next if $mylink =~ m@man/man\d/undocumented@o or
             $mylink =~ m@^etc/alternatives/@o;
-        
+
         # Possibly broken symlink
         push @brokenlinks, [$file, $mylink, $target] unless $index->{$mylink};
     }
@@ -87,7 +90,7 @@ foreach my $blink (@brokenlinks){
     my ($file, $mylink, $target) = @$blink;
     foreach my $dindex (@dindexes){
         # Is it in our dependency?
-        next BLINK if $dindex->{$mylink};
+        next BLINK if $dindex->{$mylink} || $dindex->{"$mylink/"};
     }
     # nope - not found in any of our direct dependencies.
     tag 'package-contains-broken-symlink', $file, $target

-- 
Debian package checker


Reply to: