On Thu, December 25, 2008 19:47, Thomas Goirand wrote:
> Hi,
>
> I have 2 packages that I maintain and for which I'm also upstream:
> sbox-dtc and dtc (both are in Lenny). The watch file for the second one
> doesn't work, as uscan sees the first one. Let me explain...
>
> ~/sources/dtc$ cat debian/watch
> version=3
> ftp://ftp.gplhost.com/debian/dists/stable/main/source/dtc_(.*).orig.tar.gz
>
> then in ftp://ftp.gplhost.com/debian/dists/stable/main/source/ there is
> also sbox-dtc_1.11.orig.tar.gz, and uscan sees it as higher version for
> the dtc file.
I think this is a bug in uscan's parsing of a particular format of FTP
directory listing. I've attached a patch that appears to work for me, but
not committed it yet. Feedback welcome. :-)
Regards,
Adam
--- /usr/bin/uscan 2008-12-08 06:34:30.000000000 +0000
+++ ./uscan 2008-12-26 14:14:31.000000000 +0000
@@ -985,7 +985,7 @@
} else {
# they all look like:
# info info ... info filename [ -> linkname]
- while ($content =~ m/($filepattern)(\s+->\s+\S+)?$/mg) {
+ while ($content =~ m/\s($filepattern)(\s+->\s+\S+)?$/mg) {
my $file = $1;
my $mangled_version = join(".", $file =~ m/^$filepattern$/);
foreach my $pat (@{$options{'uversionmangle'}}) {
