The following commit has been merged in the master branch:
commit 7b64088da77155e043d161c5abac94525cba91c8
Author: Christoph Berg <[email protected]>
Date: Sat Jul 30 00:48:25 2011 +0200
Also, catch warnings on non-matches of ()? constructs.
diff --git a/debian/changelog b/debian/changelog
index 05da3e7..ec12bc1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -34,6 +34,7 @@ devscripts (2.11.1) UNRELEASED; urgency=low
* debcheckout: When retrieving the source for debian/-only repositories,
move all .dsc components to the current directory, not just .orig.tar.gz.
* uscan: Catch perl warning with incorrect watch files without ().
+ Also, catch warnings on non-matches of ()? constructs.
-- David Prévot <[email protected]> Wed, 08 Jun 2011 12:16:32 -0400
diff --git a/scripts/uscan.pl b/scripts/uscan.pl
index eb15872..2ac7645 100755
--- a/scripts/uscan.pl
+++ b/scripts/uscan.pl
@@ -1574,7 +1574,7 @@ sub newest_dir ($$$$$) {
while ($content =~ m/<\s*a\s+[^>]*href\s*=\s*([\"\'])(.*?)\1/gi) {
my $href = $2;
if ($href =~ m&^$dirpattern/?$&) {
- my $mangled_version = join(".", $href =~ m&^$dirpattern/?$&);
+ my $mangled_version = join(".", map { $_ || '' } $href =~
m&^$dirpattern/?$&);
push @hrefs, [$mangled_version, $href];
}
}
--
Git repository for devscripts
--
To unsubscribe, send mail to [email protected].
