Fix mr -c <config> register. (Thanks, Daniel Bungert)

diff --git a/debian/changelog b/debian/changelog
index 8ed25d2a24b431692f203c7ca94592ae2c284868..31f1c1d2ebddc9afded901f516a8e81125b04e48 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ mr (0.30) UNRELEASED; urgency=low
   [ martin f. krafft ]
   * Several git-fake-bare improvements.
 
   [ martin f. krafft ]
   * Several git-fake-bare improvements.
 

+  [ Joey Hess ]
+  * Fix mr -c <config> register. (Thanks, Daniel Bungert)
+

  -- Joey Hess <joeyh@debian.org>  Sun, 18 May 2008 17:41:53 -0400
 
 mr (0.29) unstable; urgency=low
  -- Joey Hess <joeyh@debian.org>  Sun, 18 May 2008 17:41:53 -0400
 
 mr (0.29) unstable; urgency=low

diff --git a/mr b/mr
index 4fc7971f4fcc97ff4c3cc4e8d5d0f19288a12028..3148a3f94fba74eb4a857642fbe5595e5db5d8f7 100755 (executable)
--- a/mr
+++ b/mr
@@ -1028,8 +1028,11 @@ sub config { #{{{
 
 sub register { #{{{
        if ($config_overridden) {
 
 sub register { #{{{
        if ($config_overridden) {

-               ($directory)=$ENV{MR_CONFIG}=~/^(.*\/)[^\/]+$/;
-       } else {
+               # Find the directory that the specified config file is
+               # located in.
+               ($directory)=abs_path($ENV{MR_CONFIG})=~/^(.*\/)[^\/]+$/;
+       }
+       else {

                # Find the closest known mrconfig file to the current
                # directory.
                $directory.="/" unless $directory=~/\/$/;
                # Find the closest known mrconfig file to the current
                # directory.
                $directory.="/" unless $directory=~/\/$/;