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

[SCM] Debian package checker branch, master, updated. 2.5.4-97-gd377481



The following commit has been merged in the master branch:
commit d377481abfafefc20fe58215454c2ebaa63929ab
Author: Niels Thykier <niels@thykier.net>
Date:   Sun Jan 22 12:14:32 2012 +0100

    c/cruft: properly handle unpacked being a symlink
    
    Signed-off-by: Niels Thykier <niels@thykier.net>

diff --git a/checks/cruft b/checks/cruft
index 6fd9d39..ecd647e 100644
--- a/checks/cruft
+++ b/checks/cruft
@@ -137,8 +137,10 @@ if ($format =~ /^\s*2\.0\s*\z/ or $format =~ /^\s*3\.0\s*\(quilt\)/) {
     check_diffstat($info->diffstat, \%warned);
 }
 my $uroot = $info->unpacked;
-my $wanted = sub { find_cruft($pkg, $info, qr/\Q$uroot\E/, \%warned, $atdinbd, $ltinbd) };
-find($wanted, $info->unpacked);
+my $abs = Cwd::abs_path ("$uroot/") or fail "abs_path $uroot: $!";
+$abs =~ s,/$,,; # remove the trailing slash if any
+my $wanted = sub { find_cruft($pkg, $info, qr/\Q$abs\E/, \%warned, $atdinbd, $ltinbd) };
+find($wanted, $abs);
 
 # Look for cruft based on file's results, but allow cruft in test directories
 # where it may be part of a test suite.
diff --git a/debian/changelog b/debian/changelog
index 926f9bc..23b7be6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -30,6 +30,7 @@ lintian (2.5.5) UNRELEASED; urgency=low
       Felix Geyer for the report.  (Closes: #650325)
     + [NT] Accepted patch from Paul Wise to detect COFF object
       files as Win32 binaries.
+    + [NT] Properly handle unpacked being a symlink.
   * checks/debconf:
     + [RA] Recognize Perl uses of debconf templates via metaget or
       settitle.

-- 
Debian package checker


Reply to: