r6247 - /scripts/qa/versioncheck.pl

[dmn at users.alioth.debian.org]

Author: dmn
Date: Sat Aug  4 05:40:58 2007
New Revision: 6247

URL: http://svn.debian.org/wsvn/?sc=1&rev=6247
Log:
Fix watch opts parsing when double-quotes are used

Modified:
    scripts/qa/versioncheck.pl

Modified: scripts/qa/versioncheck.pl
URL: http://svn.debian.org/wsvn/scripts/qa/versioncheck.pl?rev=6247&op=diff
==============================================================================
--- scripts/qa/versioncheck.pl (original)
+++ scripts/qa/versioncheck.pl Sat Aug  4 05:40:58 2007
@@ -344,9 +344,9 @@
     my @vers;
     foreach(@$list)
     {
-        debugmsg("     looking at $_\n") if 0;
         if( $_ =~ $filter )
         {
+            debugmsg("     looking at $_\n") if 1;
             my $ver = $1;
             if( my $uvms = $opts->{uversionmangle} )
             {
@@ -568,8 +568,10 @@
 
         foreach(@watch_lines)
         {
+            debugmsg( "   watch line $_\n" ) if 0;
             # opts either contain no spaces, or is enclosed in double-quotes
-            my $opts = $1 if s!^\s*opts="([^"])*"\s+!! or s!^\s*opts=(\S*)\s!!;
+            my $opts = $1 if s!^\s*opts="([^"]*)"\s+!! or s!^\s*opts=(\S*)\s!!;
+            debugmsg( "     watch options = $opts\n" ) if $opts;
             # several options are separated by comma and commas are not allowed within
             my @opts = split(/\s*,\s*/, $opts) if $opts;
             my %opts;
@@ -578,6 +580,7 @@
                 next if /^(?:active|passive|pasv)$/;
 
                 /([^=]+)=(.*)/;
+                debugmsg( "      watch option $1 = $2\n" );
                 if( $1 eq 'versionmangle' )
                 {
                     push @{ $opts{uversionmangle} }, $2;