r8907 - in /scripts/qa: DebianQA/Svn.pm qareport

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

Author: tincho-guest
Date: Tue Nov  6 10:21:43 2007
New Revision: 8907

URL: http://svn.debian.org/wsvn/?sc=1&rev=8907
Log:
enhacements

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

Modified: scripts/qa/DebianQA/Svn.pm
URL: http://svn.debian.org/wsvn/scripts/qa/DebianQA/Svn.pm?rev=8907&op=diff
==============================================================================
--- scripts/qa/DebianQA/Svn.pm (original)
+++ scripts/qa/DebianQA/Svn.pm Tue Nov  6 10:21:43 2007
@@ -148,6 +148,9 @@
             $svn{$dir}{watch_error} = "Invalid";
             next;
         }
+        my @versions = sort({ deb_compare($a, $b) }
+            grep(defined, map({ $_->{unmangled_ver} } @$watch)));
+        $svn{$dir}{mangled_ver} = $versions[-1];
         $svn{$dir}{watch} = $watch;
     }
     # Retain lock

Modified: scripts/qa/qareport
URL: http://svn.debian.org/wsvn/scripts/qa/qareport?rev=8907&op=diff
==============================================================================
--- scripts/qa/qareport (original)
+++ scripts/qa/qareport Tue Nov  6 10:21:43 2007
@@ -12,6 +12,7 @@
 use DebianQA::Cache;
 use DebianQA::Common;
 use DebianQA::Config;
+use DebianQA::DebVersions;
 use DebianQA::Svn;
 use Getopt::Long;
 
@@ -39,25 +40,39 @@
 foreach my $pkg (@pkglist) {
     next if($pkg =~ /^\//);
     my $svnpath = $data->{svn}{$pkg}{dir};
-    print "$pkg:", ( $pkg ne $svnpath ? " (SVN: $svnpath)" : '' ), "\n";
-    print " - Version status:\n";
-    my $werr = $data->{watch}{$pkg}{error} || "OK";
-    print "   + Watch status: $werr\n";
-
-    my $dver = $data->{svn}{$pkg}{version} || "none";
-    print "   + SVN: $dver ";
-
+    my $werr = $data->{watch}{$pkg}{error};
+    my $dver = $data->{svn}{$pkg}{version} || 0;
+    my $dwerr = $data->{svn}{$pkg}{watch_error};
+    my $m_dver = $data->{svn}{$pkg}{version} || 0;
     my $undver = $data->{svn}{$pkg}{un_version};
-    print "(unreleased: $undver) " if($undver);
-
-    my $archver = $data->{archive}{$pkg}{most_recent} || "Not uploaded";
-    print "Archive: $archver ";
-
-    my $uver = $data->{watch}{$pkg}{upstream_ver} || "Unknown";
-    print "Upstream: $uver\n";
-
+    my $archver = $data->{archive}{$pkg}{most_recent} || 0;
+    my $uver = $data->{watch}{$pkg}{upstream_ver};
     my @bugs = @{$data->{bts}{$pkg}};
     @bugs = map({ "#$_" } @bugs);
+
+    my $status;
+    if(! $dver) {
+        $status = "Needs finishing";
+    } elsif($dwerr) {
+        $status = "Watchfile problem";
+    } elsif(deb_compare($archver, $dver) > 0) {
+        $status = "Ancient version in SVN";
+    } elsif(deb_compare($archver, $dver) != 0) {
+        $status = "Needs uploading";
+    } elsif(! $uver) {
+        $status = "Watchfile problem";
+    } elsif(deb_compare($dver, $uver) > 0) {
+        $status = "Ancient version in upstream?";
+    } elsif(deb_compare($dver, $uver) != 0) {
+        $status = "Needs upgrading to newer upstream";
+    }
+    print "$pkg:", ( $pkg ne $svnpath ? " (SVN: $svnpath)" : '' ), "\n";
+    print " - Version status: ", $status || "OK!", "\n";
+    print "   + Watch status: ", $werr || "OK", "\n";
+    print "   + SVN: ", $dver || "none";
+    print " (unreleased: $undver)" if($undver);
+    print " Archive: ", $archver || "Not uploaded";
+    print " Upstream: ", $uver || "Unknown", "\n";
     print "   + Bugs: ", join(", ", @bugs), "\n" if(@bugs);
 }
 #use Data::Dumper; print Dumper $data;