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

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

Author: tincho-guest
Date: Thu Feb  7 19:22:42 2008
New Revision: 14255

URL: http://svn.debian.org/wsvn/?sc=1&rev=14255
Log:
Restore proper forced behaviour

Modified:
    scripts/qa/DebianQA/Svn.pm

Modified: scripts/qa/DebianQA/Svn.pm
URL: http://svn.debian.org/wsvn/scripts/qa/DebianQA/Svn.pm?rev=14255&op=diff
==============================================================================
--- scripts/qa/DebianQA/Svn.pm (original)
+++ scripts/qa/DebianQA/Svn.pm Thu Feb  7 19:22:42 2008
@@ -66,10 +66,12 @@
                 $revision = $_[1]->rev();
             }, 0);
     }
-    my $cdata = read_cache("svn", "", 0);
-    my @new = grep({! $cdata->{$_}} @dirlist);
-    if(find_stamp($cdata, "") == $revision and not @new) {
-        return (); # Cache is up-to-date
+    unless($force) {
+        my $cdata = read_cache("svn", "", 0);
+        my @new = grep({! $cdata->{$_}} @dirlist);
+        if(find_stamp($cdata, "") == $revision and not @new) {
+            return (); # Cache is up-to-date
+        }
     }
 
     my($pkgdata, @changed) = svn_scanpackages($force, $revision, $svnpkgpath,
@@ -91,7 +93,7 @@
     }
     # Retain lock
     my $complete = ! @dirlist;
-    $cdata = update_cache("svn", $pkgdata, "", $complete, 1, $revision);
+    my $cdata = update_cache("svn", $pkgdata, "", $complete, 1, $revision);
 
     my @pkglist = grep({ ref $cdata->{$_} and $cdata->{$_}{pkgname} }
         keys(%$cdata));
@@ -122,10 +124,12 @@
     my($force, $revision, $prepath, $postpath, @dirlist) = @_;
 
     info("Scanning tags from SVN");
-    my $cdata = read_cache("svn", "", 0);
+    my $cdata;
+    $cdata = read_cache("svn", "", 0) unless($force);
     my %tags;
     foreach my $dir (@dirlist) {
-        if(find_stamp($cdata, $dir) < $revision) {
+        if($force or not $cdata->{$dir}{tags}
+                or find_stamp($cdata, $dir) < $revision) {
             debug("Retrieving tags for $dir");
             my $pkghome = "$prepath/$dir$postpath";
             my $tagdirs = safe_svn_op($svn, ls => $pkghome, 'HEAD', 0);