r15902 - in /scripts/qa/DebianQA: Cache.pm DebVersions.pm Svn.pm

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

Author: tincho-guest
Date: Thu Feb 28 18:10:12 2008
New Revision: 15902

URL: http://svn.debian.org/wsvn/?sc=1&rev=15902
Log:
DebVersions: export deb_parse. Cache: upgrade old version file notice to info. Svn: if consolidated is old format, cache is NOT up-to-date

Modified:
    scripts/qa/DebianQA/Cache.pm
    scripts/qa/DebianQA/DebVersions.pm
    scripts/qa/DebianQA/Svn.pm

Modified: scripts/qa/DebianQA/Cache.pm
URL: http://svn.debian.org/wsvn/scripts/qa/DebianQA/Cache.pm?rev=15902&op=diff
==============================================================================
--- scripts/qa/DebianQA/Cache.pm (original)
+++ scripts/qa/DebianQA/Cache.pm Thu Feb 28 18:10:12 2008
@@ -212,7 +212,7 @@
     debug("find_stamp($hash, $path) invoked");
     die "Invalid hashref" unless($hash and ref $hash and ref $hash eq "HASH");
     if(! $hash->{"/version"} or $hash->{"/version"} < $VERSION) {
-        debug("find_stamp: returning 0 as cache has old version");
+        info("find_stamp: returning 0 as cache has old version");
         return 0;
     }
     my $ctsmp = 0;

Modified: scripts/qa/DebianQA/DebVersions.pm
URL: http://svn.debian.org/wsvn/scripts/qa/DebianQA/DebVersions.pm?rev=15902&op=diff
==============================================================================
--- scripts/qa/DebianQA/DebVersions.pm (original)
+++ scripts/qa/DebianQA/DebVersions.pm Thu Feb 28 18:10:12 2008
@@ -14,7 +14,7 @@
 use Carp;
 
 our @ISA = "Exporter";
-our @EXPORT = qw( deb_compare deb_compare_nofail );
+our @EXPORT = qw( deb_compare deb_compare_nofail deb_parse );
 
 sub deb_parse($) {
     my $v = shift;

Modified: scripts/qa/DebianQA/Svn.pm
URL: http://svn.debian.org/wsvn/scripts/qa/DebianQA/Svn.pm?rev=15902&op=diff
==============================================================================
--- scripts/qa/DebianQA/Svn.pm (original)
+++ scripts/qa/DebianQA/Svn.pm Thu Feb 28 18:10:12 2008
@@ -79,10 +79,15 @@
         my $cdata = read_cache("svn", "", 0);
         if(find_stamp($cdata, "")) {
             my @new = grep({! $cdata->{$_}} @dirlist);
-            if(find_stamp($cdata, "") == $revision and not @new) {
-                return (); # Cache is up-to-date
-            }
-        } else {
+            if(find_stamp($cdata, "") == $revision and not @new
+                # don't return if consolidated caches are missing or old
+                    and find_stamp(read_cache("consolidated", "pkglist", 0))
+                    and find_stamp(read_cache("consolidated", "svn", 0))
+            ) {
+                info("SVN cache is up-to-date");
+                return ();
+            }
+        } else { # New or old file format
             $force = 1;
         }
     }