[SCM] Debian package checker branch, master, updated. 2.5.11-269-g4fa9095
The following commit has been merged in the master branch:
commit 96c3f131e0ec7afb45fa373028bab667cd4d67e1
Author: Niels Thykier <niels@thykier.net>
Date: Sun Apr 7 23:45:17 2013 +0200
L::Util: Fix bug in resolve_pkg_path
Fix a bug in resolve_pkg_path that caused it to reolve some paths
wrong.
Signed-off-by: Niels Thykier <niels@thykier.net>
diff --git a/debian/changelog b/debian/changelog
index 3b28677..bee0c39 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -309,6 +309,8 @@ lintian (2.5.12) UNRELEASED; urgency=low
+ [ADB] Fix a typo in the matching of expected delimiters for some
signed messages; thanks Samuel Bronson.
+ [NT] Add sub to check if a path is contained within a given dir.
+ + [NT] Fix bug in resolve_pkg_path that made it resolve some links
+ incorrectly.
* man/lintian.pod.in:
+ [NT] Document that --pedantic is the same as "-L +=pedantic".
diff --git a/lib/Lintian/Util.pm b/lib/Lintian/Util.pm
index 0bda4b9..96340d4 100644
--- a/lib/Lintian/Util.pm
+++ b/lib/Lintian/Util.pm
@@ -1114,7 +1114,7 @@ sub resolve_pkg_path {
my ($curdir, $dest) = @_;
my (@cc, @dc);
my $target;
- $dest =~ s,//++,/,o;
+ $dest =~ s,//++,/,go;
# short curcuit $dest eq '/' case.
return '.' if $dest eq '/';
# remove any initial ./ and trailing slashes.
@@ -1128,7 +1128,7 @@ sub resolve_pkg_path {
}
# clean up $curdir (as well)
- $curdir =~ s,//++,/,o;
+ $curdir =~ s,//++,/,go;
$curdir =~ s,/$,,o;
$curdir =~ s,^/,,o;
$curdir =~ s,^\./,,o;
--
Debian package checker
Reply to: