[devscripts] 01/01: uscan: Anchor $filepattern in ftp listing

[James McCoy]

This is an automated email from the git hooks/post-receive script.

jamessan pushed a commit to branch master
in repository devscripts.

commit 4632f61206d2a4a9dd443b6b4a4257220437be74
Author: James McCoy <jamessan at debian.org>
Date:   Sun Mar 20 12:28:45 2016 -0400

    uscan: Anchor $filepattern in ftp listing
    
    Regression introduced in 50079356.  Prior to that, the pattern match
    embedded required a \s match before $filepattern.  This is now being
    processed out before applying the pattern match.  Anchoring the match to
    the start of the string has the same effect on the post-processed form.
    
    Closes: #818727
    Signed-off-by: James McCoy <jamessan at debian.org>
---
 debian/changelog | 8 ++++++++
 scripts/uscan.pl | 4 ++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3b8bd1c..82536a5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+devscripts (2.16.3) UNRELEASED; urgency=medium
+
+  * uscan:
+    + Fix regression in processing FTP listings when file pattern is the tail
+      of another filename.  (Closes: #818727)
+
+ -- James McCoy <jamessan at debian.org>  Sun, 20 Mar 2016 12:26:04 -0400
+
 devscripts (2.16.2) unstable; urgency=medium
 
   [ Osamu Aoki ]
diff --git a/scripts/uscan.pl b/scripts/uscan.pl
index 728c78b..5e2ee59 100755
--- a/scripts/uscan.pl
+++ b/scripts/uscan.pl
@@ -3088,7 +3088,7 @@ sub process_watchline ($$$$$$)
 		$ln =~ s/^d.*$//; # FTP listing of directory, '' skiped by if ($ln...
 		$ln =~ s/\s+->\s+\S+$//; # FTP listing for link destination
 		$ln =~ s/^.*\s(\S+)$/$1/; # filename only
-		if ($ln and $ln =~ m/($filepattern)$/) {
+		if ($ln and $ln =~ m/^($filepattern)$/) {
 		    my $file = $1;
 		    my $mangled_version = join(".", $file =~ m/^$filepattern$/);
 		    foreach my $pat (@{$options{'uversionmangle'}}) {
@@ -4009,7 +4009,7 @@ sub newest_dir ($$$$$) {
 		$ln =~ s/^-.*$//; # FTP listing of file, '' skiped by if ($ln...
 		$ln =~ s/\s+->\s+\S+$//; # FTP listing for link destination
 		$ln =~ s/^.*\s(\S+)$/$1/; # filename only
-		if ($ln =~ m/($pattern)(\s+->\s+\S+)?$/) {
+		if ($ln =~ m/^($pattern)(\s+->\s+\S+)?$/) {
 		    my $dir = $1;
 		    uscan_verbose "Matching target for dirversionmangle:   $dir\n";
 		    my $mangled_version = join(".", $dir =~ m/^$pattern$/);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/devscripts.git