Package: devscripts Version: 2.9.20 Tags: patch with the following watch file, uscan detects the newest dir http://tmrc.mit.edu/mirror/twisted/Twisted/2.4/, but then returns the absolute URL, whereas the calling function just expects the relative part. the second chunk of the patch fixes that by removing the $base part from the returned URL.
the first chunk just collapses multiple slashes at the end of the directory in recursive_regex_dir, which are accumulated in the function. version=3 http://tmrc.mit.edu/mirror/twisted/Twisted/(\d\.\d)/ Twisted-([\d\.]*)\.tar\.bz2 diff -Nru /tmp/NGa9JPmtrD/devscripts-2.9.20/debian/changelog /tmp/suHtrrAFPl/devscripts-2.9.21/debian/changelog --- /tmp/NGa9JPmtrD/devscripts-2.9.20/debian/changelog 2006-05-17 06:27:35.000000000 +0000 +++ /tmp/suHtrrAFPl/devscripts-2.9.21/debian/changelog 2006-07-09 16:37:39.000000000 +0000 @@ -1,3 +1,10 @@ +devscripts (2.9.21) unstable; urgency=low + + * Fix recursive handling of http URL's where the directory URL is + an absolute HREF pointing to a local directory. + + -- Matthias Klose <[EMAIL PROTECTED]> Sun, 9 Jul 2006 16:35:07 +0000 + devscripts (2.9.20) unstable; urgency=low * debuild: set DEB_{BUILD,HOST}_* variables as dpkg-buildpackage does diff -Nru /tmp/NGa9JPmtrD/devscripts-2.9.20/uscan.pl /tmp/suHtrrAFPl/devscripts-2.9.21/uscan.pl --- /tmp/NGa9JPmtrD/devscripts-2.9.20/uscan.pl 2006-04-18 16:58:30.000000000 +0000 +++ /tmp/suHtrrAFPl/devscripts-2.9.21/uscan.pl 2006-07-09 16:34:54.000000000 +0000 @@ -1180,6 +1180,7 @@ $dir .= "$dirpattern"; } } + $dir =~ s/\/+$/\//; return $site . $dir; } @@ -1228,6 +1229,7 @@ } @hrefs = Devscripts::Versort::versort(@hrefs); my ($newversion, $newdir) = @{$hrefs[0]}; + $newdir =~ s/$base//; return $newdir; } else { warn "$progname warning: In $watchfile,\n no matching hrefs for pattern\n $site$dir$pattern"; -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
