r8880 - in /scripts/qa/DebianQA: DebVersions.pm Watch.pm

[tincho-guest at users.alioth.debian.org]

Author: tincho-guest
Date: Mon Nov  5 19:22:51 2007
New Revision: 8880

URL: http://svn.debian.org/wsvn/?sc=1&rev=8880
Log:
- Validation of errors from deb_compare in Watch.
- Added "_" as a valid version char in DebVersions.

Modified:
    scripts/qa/DebianQA/DebVersions.pm
    scripts/qa/DebianQA/Watch.pm

Modified: scripts/qa/DebianQA/DebVersions.pm
URL: http://svn.debian.org/wsvn/scripts/qa/DebianQA/DebVersions.pm?rev=8880&op=diff
==============================================================================
--- scripts/qa/DebianQA/DebVersions.pm (original)
+++ scripts/qa/DebianQA/DebVersions.pm Mon Nov  5 19:22:51 2007
@@ -17,7 +17,7 @@
 
 sub deb_parse($) {
     my $v = shift;
-    unless($v =~ /^(?:(\d+):)?([A-Za-z0-9+.:~-]*?)(?:-([+.~A-Za-z0-9]+))?$/) {
+    unless($v =~ /^(?:(\d+):)?([A-Za-z0-9+.:~_-]*?)(?:-([+.~_A-Za-z0-9]+))?$/) {
         warn "Invalid debian package version: $v\n";
         return ();
     };

Modified: scripts/qa/DebianQA/Watch.pm
URL: http://svn.debian.org/wsvn/scripts/qa/DebianQA/Watch.pm?rev=8880&op=diff
==============================================================================
--- scripts/qa/DebianQA/Watch.pm (original)
+++ scripts/qa/DebianQA/Watch.pm Mon Nov  5 19:22:51 2007
@@ -68,9 +68,12 @@
                     upstream_mangled => $ups_mangled
                 };
             }
-            my $diff = deb_compare($wline->{unmangled_ver},
-                $watch{$md5}{upstream_mangled}) if(
-                $watch{$md5}{upstream_mangled});
+            my $diff;
+            if($watch{$md5}{upstream_mangled}) {
+                $diff = deb_compare($wline->{unmangled_ver},
+                    $watch{$md5}{upstream_mangled});
+                $watch{$md5}{watch_error} = "InvalidVersion" unless($diff);
+            }
             push @wresult, [ $diff, @{$watch{$md5}}{
                 qw/watch_error upstream_version upstream_mangled/ } ];
         }