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

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

Author: tincho-guest
Date: Thu Nov  8 12:51:24 2007
New Revision: 9028

URL: http://svn.debian.org/wsvn/?sc=1&rev=9028
Log:
really fix the svn issue

Modified:
    scripts/qa/DebianQA/Svn.pm

Modified: scripts/qa/DebianQA/Svn.pm
URL: http://svn.debian.org/wsvn/scripts/qa/DebianQA/Svn.pm?rev=9028&op=diff
==============================================================================
--- scripts/qa/DebianQA/Svn.pm (original)
+++ scripts/qa/DebianQA/Svn.pm Thu Nov  8 12:51:24 2007
@@ -45,7 +45,8 @@
     $svnpath .= $CFG{svn}{packages_path} if($CFG{svn}{packages_path});
     $svnpath =~ s{/+$}{};
     my $svnpostpath = $CFG{svn}{post_path} || "";
-    $svnpostpath =~ s{^/*(.*?)/*$}{$1};
+    # Always has a slash if not empty
+    $svnpostpath =~ s{^/*(.*?)/*$}{/$1} if($svnpostpath);
 
     my $complete = ! @dirlist;
 
@@ -85,7 +86,7 @@
         foreach my $dir (grep({ $cache_vers{$_}
                     and $cache_vers{$_} < $revision } @dirlist)) {
             $dir =~ s{^/*(.*?)/*$}{$1};
-            my $pkghome = "$svnpath/$dir/$svnpostpath";
+            my $pkghome = "$svnpath/$dir$svnpostpath";
             $svn->log([ $pkghome ], $cache_vers{$dir}, "HEAD", 1, 1,
                 sub {
                     foreach (keys %{$_[0]}) {
@@ -104,7 +105,7 @@
         $svn{$dir} = {};
         info("Retrieving changelog for $dir");
         my $changelog = get_svn_file($svn,
-            "$svnpath/$dir/$svnpostpath/debian/changelog");
+            "$svnpath/$dir$svnpostpath/debian/changelog");
 
         unless($changelog) {
             $svn{$dir}{error} = "Missing";
@@ -147,7 +148,7 @@
 
         info("Retrieving watchfile for $dir");
         my $watch = get_svn_file($svn,
-            "$svnpath/$dir/$svnpostpath/debian/watch");
+            "$svnpath/$dir$svnpostpath/debian/watch");
         unless($watch) {
             if($svn{$dir}{version} and $svn{$dir}{version} !~ /-/) {
                 $svn{$dir}{watch_error} = "Native";