r9069 - /scripts/qa/DebianQA/Svn.pm

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

Author: tincho-guest
Date: Fri Nov  9 12:59:55 2007
New Revision: 9069

URL: http://svn.debian.org/wsvn/?sc=1&rev=9069
Log:
Add unmangled_un_ver (heh)

Modified:
    scripts/qa/DebianQA/Svn.pm

Modified: scripts/qa/DebianQA/Svn.pm
URL: http://svn.debian.org/wsvn/scripts/qa/DebianQA/Svn.pm?rev=9069&op=diff
==============================================================================
--- scripts/qa/DebianQA/Svn.pm (original)
+++ scripts/qa/DebianQA/Svn.pm Fri Nov  9 12:59:55 2007
@@ -147,9 +147,9 @@
         $svn{$dir}{pkgname} = $parser->dpkg()->{Source};
 
         info("Retrieving watchfile for $dir");
-        my $watch = get_svn_file($svn,
+        my $watchdata = get_svn_file($svn,
             "$svnpath/$dir$svnpostpath/debian/watch");
-        unless($watch) {
+        unless($watchdata) {
             if($svn{$dir}{version} and $svn{$dir}{version} !~ /-/) {
                 $svn{$dir}{watch_error} = "Native";
             } else {
@@ -157,7 +157,7 @@
             }
             next;
         }
-        $watch = parse_watch($svn{$dir}{version}, $watch);
+        my $watch = parse_watch($svn{$dir}{version}, $watchdata);
         # Returns undef on error
         unless($watch and @$watch) {
             $svn{$dir}{watch_error} = "Invalid";
@@ -165,8 +165,19 @@
         }
         my @versions = sort({ deb_compare_nofail($a, $b) }
             grep(defined, map({ $_->{unmangled_ver} } @$watch)));
+
         $svn{$dir}{unmangled_ver} = $versions[-1];
         $svn{$dir}{watch} = $watch;
+
+        # Again for unreleased
+        $watch = parse_watch($svn{$dir}{un_version}, $watchdata) if(
+            $svn{$dir}{un_version});
+        # Returns undef on error
+        if($watch and @$watch) {
+            @versions = sort({ deb_compare_nofail($a, $b) }
+                grep(defined, map({ $_->{unmangled_ver} } @$watch)));
+            $svn{$dir}{unmangled_un_ver} = $versions[-1];
+        }
     }
     # Retain lock
     my $cdata = update_cache("svn", \%svn, "", $complete, 1, $revision);