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

[SCM] Debian package checker branch, master, updated. 2.5.4-21-g7e2f610



The following commit has been merged in the master branch:
commit 7e2f6103b992061144be9396744036f55b19c8f0
Author: Niels Thykier <niels@thykier.net>
Date:   Sat Dec 3 09:55:08 2011 +0100

    Skip langpack links if they appear to be correct
    
    Signed-off-by: Niels Thykier <niels@thykier.net>

diff --git a/checks/symlinks b/checks/symlinks
index 8cd5126..80f1e3a 100644
--- a/checks/symlinks
+++ b/checks/symlinks
@@ -69,6 +69,15 @@ foreach my $file (@{$info->sorted_index}) {
             $path =~ m@^usr/share/java/[^/]+\.jar$@o or
             $path eq 'lib/init/upstart-job';
 
+        # Skip langpack links (used in Ubuntu) - after we check that
+        # it appears to be consistent.
+        if ($path =~ m,/([^/]+)-langpack/,o) {
+            my $pre = $1;
+            my $t = $path;
+            $t =~ s,/\Q$pre\E-langpack/,/help/,;
+            next if $t eq $file;
+        }
+
         # Possibly broken symlink
         push @brokenlinks, [$file, $path, $target] unless $index->{$path};
     }
diff --git a/debian/changelog b/debian/changelog
index f8018b5..12cafc8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,9 @@ lintian (2.5.5) UNRELEASED; urgency=low
   * checks/files:
     + [JW,NT] Skip "Multi-Arch: same" check of gzip files if their
       install path contains the architecture.  (Closes: #650665)
+  * checks/symlinks:
+    + [NT] Ignore langpack symlinks if they appear to be consistent.
+      Thanks to Evan Broder for the report.  (Closes: #650793)
 
   * collection/index:
     + [NT] Use Lintian::Processable::Package to determine source

-- 
Debian package checker


Reply to: