[Pkg-ruby-extras-maintainers] r375 - tools/ruby-pkg-tools/trunk/bin

[Thierry Reding]

Author: beatle-guest
Date: 2006-03-22 13:04:18 +0000 (Wed, 22 Mar 2006)
New Revision: 375

Modified:
   tools/ruby-pkg-tools/trunk/bin/pkg-ruby-get-sources
Log:
* Improve the regular expression to take into account *all* non-whitespace
  characters.

* Fix a bug where the script would use the complete line read from the watch
  file, substitute the version and pass it on as URL, even if it contains more
  than just the URL field.


Modified: tools/ruby-pkg-tools/trunk/bin/pkg-ruby-get-sources
===================================================================
--- tools/ruby-pkg-tools/trunk/bin/pkg-ruby-get-sources	2006-03-22 12:19:34 UTC (rev 374)
+++ tools/ruby-pkg-tools/trunk/bin/pkg-ruby-get-sources	2006-03-22 13:04:18 UTC (rev 375)
@@ -240,8 +240,9 @@
   watch = File.new('debian/watch')
   puts "I: Using watch file" if $verbose
   watch.each { |line|
-    if line =~ /(http|ftp):\/\/[^\s]+/ then
-      tarball = line.gsub(/\\/, '')
+    if line =~ /(http|ftp):\/\/\S+/ then
+      tarball = Regexp.last_match(0)
+      tarball.gsub!(/\\/, '')
       tarball.gsub!(/\(.*\)/, version)
 
       if not $list_available then