Avoid using abs_path to determine canonical repo path, as that fails when the repo...

diff --git a/debian/changelog b/debian/changelog
index 4d07a624ce9961b4e6cb508b5252915af05d5bbc..8ba415951f056ce74bf598c25179cd1f6251ea13 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mr (0.46) unstable; urgency=low
+
+  * Avoid using abs_path to determine canonical repo path, as that fails
+    when the repo has not yet been checked out.
+
+ -- Joey Hess <joeyh@debian.org>  Thu, 10 Dec 2009 17:28:26 -0500
+
 mr (0.45) unstable; urgency=low
 
   * Fix pod error. Closes: #558012

diff --git a/mr b/mr
index b5d5c118b8d4ef9c9c470196e64f5214c330a3c4..1a57570f9953dff1c3e5ec59b201daeed904ee36 100755 (executable)
--- a/mr
+++ b/mr
@@ -791,7 +791,9 @@ sub repodir {
        my $repo=shift;
        my $topdir=$repo->{topdir};
        my $subdir=$repo->{subdir};
-       return abs_path(($subdir =~/^\//) ? $subdir : $topdir.$subdir);
+       my $ret=($subdir =~/^\//) ? $subdir : $topdir.$subdir;
+       $ret=~s/\/\.$//;
+       return $ret;
 }
 
 # figure out which repos to act on