r8917 - in /scripts/qa/DebianQA: Svn.pm Watch.pm

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

Author: tincho-guest
Date: Tue Nov  6 11:26:32 2007
New Revision: 8917

URL: http://svn.debian.org/wsvn/?sc=1&rev=8917
Log:
Other problem with version mangling plus some spurious errors.

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

Modified: scripts/qa/DebianQA/Svn.pm
URL: http://svn.debian.org/wsvn/scripts/qa/DebianQA/Svn.pm?rev=8917&op=diff
==============================================================================
--- scripts/qa/DebianQA/Svn.pm (original)
+++ scripts/qa/DebianQA/Svn.pm Tue Nov  6 11:26:32 2007
@@ -255,7 +255,8 @@
         }
         my $unmangled = $version;
         if($version and $opts{dversionmangle}) {
-            foreach(split(/;/, @{$opts{dversionmangle}})) {
+            foreach(split(/;/, join(";", @{$opts{dversionmangle}}))) {
+                debug("Executing \$unmangled =~ $_");
                 eval "\$unmangled =~ $_";
                 if($@) {
                     error("Invalid watchfile: $@");

Modified: scripts/qa/DebianQA/Watch.pm
URL: http://svn.debian.org/wsvn/scripts/qa/DebianQA/Watch.pm?rev=8917&op=diff
==============================================================================
--- scripts/qa/DebianQA/Watch.pm (original)
+++ scripts/qa/DebianQA/Watch.pm Tue Nov  6 11:26:32 2007
@@ -105,12 +105,21 @@
         my @result;
         if(@result = grep({ $_->[0] < 0 } @noerror)) {
             $watch2{$pkg} = {
-                error => "NeedsUpgrade", upstream_ver => $result[-1][2] };
+                info => "NeedsUpgrade",
+                upstream_ver => $result[-1][2],
+                upstream_mangled => $result[-1][3]
+            };
         } elsif(@result = grep( { not $_->[0] } @noerror)) {
-            $watch2{$pkg} = { upstream_ver => $result[0][2] }; # OK
+            $watch2{$pkg} = {
+                upstream_ver => $result[0][2],
+                upstream_mangled => $result[0][3]
+            }; # OK
         } else {
-            $watch2{$pkg} = { error => "NewerThanUpstream",
-                upstream_ver => $noerror[0][2] };
+            $watch2{$pkg} = {
+                info => "NewerThanUpstream",
+                upstream_ver => $noerror[0][2],
+                upstream_mangled => $noerror[0][3]
+            };
         }
     }
     update_cache("watch", \%watch, "", $complete, 1);