r8913 - in /scripts/qa: DebianQA/Svn.pm DebianQA/Watch.pm qareport

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

Author: tincho-guest
Date: Tue Nov  6 11:01:49 2007
New Revision: 8913

URL: http://svn.debian.org/wsvn/?sc=1&rev=8913
Log:
- qareport: sort output
- Watch: Added some debugging and fixed problem in version mangling
- Svn: Allow to recover from a damaged database.

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

Modified: scripts/qa/DebianQA/Svn.pm
URL: http://svn.debian.org/wsvn/scripts/qa/DebianQA/Svn.pm?rev=8913&op=diff
==============================================================================
--- scripts/qa/DebianQA/Svn.pm (original)
+++ scripts/qa/DebianQA/Svn.pm Tue Nov  6 11:01:49 2007
@@ -51,6 +51,7 @@
         my %dirlist = %{$svn->ls($svnpath, 'HEAD', 0)};
         @dirlist = grep({ $dirlist{$_}->kind() == $SVN::Node::dir }
             keys(%dirlist));
+        debug(scalar @dirlist, " directories to process");
     }
     my(@changed, %svn);
     if($force) {
@@ -62,7 +63,8 @@
         }
 
         # Stamps from cache
-        my %cache_vers = map({ $_ => find_stamp($cdata, $_) } @dirlist);
+        my %cache_vers = map({ $_ => find_stamp($cdata, $_) }
+            grep({ $cdata->{$_} } @dirlist));
         # Never updated
         @changed = grep( { not $cache_vers{$_} } @dirlist);
 
@@ -261,6 +263,7 @@
                 }
             }
         }
+        debug("Mangled version: $unmangled");
         push @wspecs, {
             line => $_,
             unmangled_ver => $unmangled,

Modified: scripts/qa/DebianQA/Watch.pm
URL: http://svn.debian.org/wsvn/scripts/qa/DebianQA/Watch.pm?rev=8913&op=diff
==============================================================================
--- scripts/qa/DebianQA/Watch.pm (original)
+++ scripts/qa/DebianQA/Watch.pm Tue Nov  6 11:01:49 2007
@@ -180,13 +180,16 @@
     foreach my $uver (@vers) {
         push @mangled, $uver;
         next unless($watch{opts}{uversionmangle});
-        foreach(split(/;/, @{$watch{opts}{uversionmangle}})) {
+        debug("Mangle option: ", join(", ", @{$watch{opts}{uversionmangle}}));
+        foreach(split(/;/, join(";", @{$watch{opts}{uversionmangle}}))) {
+            debug("Executing '\$mangled[-1] =~ $_'");
             eval "\$mangled[-1] =~ $_";
             if($@) {
                 error("Invalid watchfile: $@");
                 return("Invalid");
             }
         }
+        debug("Mangled version: $mangled[-1]");
     }
     return("Invalid") unless(@vers);
     my @order = sort({ deb_compare($mangled[$a], $mangled[$b]) } (0..$#vers));

Modified: scripts/qa/qareport
URL: http://svn.debian.org/wsvn/scripts/qa/qareport?rev=8913&op=diff
==============================================================================
--- scripts/qa/qareport (original)
+++ scripts/qa/qareport Tue Nov  6 11:01:49 2007
@@ -37,7 +37,7 @@
 my @pkglist = @dirs;
 @pkglist = get_pkglist() unless(@pkglist);
 
-foreach my $pkg (@pkglist) {
+foreach my $pkg (sort @pkglist) {
     next if($pkg =~ /^\//);
     my $svnpath = $data->{svn}{$pkg}{dir};
     my $werr = $data->{watch}{$pkg}{error};