The following commit has been merged in the master branch:
commit 95c77aa91d9bc6bf68da3bad4aa96db11fb80937
Author: Christoph Berg <[email protected]>
Date: Sat Jul 30 00:37:27 2011 +0200
uscan: Catch perl warning with incorrect watch files without ().
diff --git a/debian/changelog b/debian/changelog
index 96f4a2c..05da3e7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -33,6 +33,7 @@ devscripts (2.11.1) UNRELEASED; urgency=low
package.
* 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 ().
-- David Prévot <[email protected]> Wed, 08 Jun 2011 12:16:32 -0400
diff --git a/scripts/uscan.pl b/scripts/uscan.pl
index c1599d3..eb15872 100755
--- a/scripts/uscan.pl
+++ b/scripts/uscan.pl
@@ -785,7 +785,7 @@ sub process_watchline ($$$$$$)
}
# Check all's OK
- if ($filepattern !~ /\(.*\)/) {
+ if (not $filepattern or $filepattern !~ /\(.*\)/) {
warn "$progname warning: Filename pattern missing version
delimiters ()\n in $watchfile, skipping:\n $line\n";
return 1;
}
--
Git repository for devscripts
--
To unsubscribe, send mail to [email protected].
