Fix handling of a repository in "."

I threw in an abs_path because a repository in "." would turn into
something like "/home/joey/."

I think this is a reasonably safe change.

diff --git a/debian/changelog b/debian/changelog
index d91b3f9b8a67c5d0add0b9984fb79c939a5aa128..00caea6fe78adc68520f645e432d655ac4aa244e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ mr (0.45) UNRELEASED; urgency=low
   * bootstrap: Improve stats display.
   * Add --insecure option that can be used to ignore SSL cert errors
     when bootstrapping. (Pavel Avgustinov)
   * bootstrap: Improve stats display.
   * Add --insecure option that can be used to ignore SSL cert errors
     when bootstrapping. (Pavel Avgustinov)

+  * Fix handling of a repository in "."

 
  -- Joey Hess <joeyh@debian.org>  Wed, 25 Nov 2009 17:27:23 -0500
 
 
  -- Joey Hess <joeyh@debian.org>  Wed, 25 Nov 2009 17:27:23 -0500
 

diff --git a/mr b/mr
index 620ad7faa000e640d43ee407ae313f3eeb682be4..b5d5c118b8d4ef9c9c470196e64f5214c330a3c4 100755 (executable)
--- a/mr
+++ b/mr
@@ -787,6 +787,13 @@ sub repolist {
        } @list;
 }
 
        } @list;
 }
 

+sub repodir {
+       my $repo=shift;
+       my $topdir=$repo->{topdir};
+       my $subdir=$repo->{subdir};
+       return abs_path(($subdir =~/^\//) ? $subdir : $topdir.$subdir);
+}
+

 # figure out which repos to act on
 sub selectrepos {
        my @repos;
 # figure out which repos to act on
 sub selectrepos {
        my @repos;


@@ -795,7 +802,7 @@ sub selectrepos {
                my $subdir=$repo->{subdir};
 
                next if $subdir eq 'DEFAULT';
                my $subdir=$repo->{subdir};
 
                next if $subdir eq 'DEFAULT';

-               my $dir=($subdir =~/^\//) ? $subdir : $topdir.$subdir;
+               my $dir=repodir($repo);

                my $d=$directory;
                $dir.="/" unless $dir=~/\/$/;
                $d.="/" unless $d=~/\/$/;
                my $d=$directory;
                $dir.="/" unless $dir=~/\/$/;
                $d.="/" unless $d=~/\/$/;


@@ -815,7 +822,7 @@ sub selectrepos {
                        my $subdir=$repo->{subdir};
                        
                        next if $subdir eq 'DEFAULT';
                        my $subdir=$repo->{subdir};
                        
                        next if $subdir eq 'DEFAULT';

-                       my $dir=($subdir =~/^\//) ? $subdir : $topdir.$subdir;
+                       my $dir=repodir($repo);

                        my $d=$directory;
                        $dir.="/" unless $dir=~/\/$/;
                        $d.="/" unless $d=~/\/$/;
                        my $d=$directory;
                        $dir.="/" unless $dir=~/\/$/;
                        $d.="/" unless $d=~/\/$/;