releasing version 0.30

[code/myrepos.git] / mr

diff --git a/mr b/mr
index bb98ba674df60d6c2cc9e46537c87bc09190a12c..3148a3f94fba74eb4a857642fbe5595e5db5d8f7 100755 (executable)
--- a/mr
+++ b/mr
@@ -425,6 +425,8 @@ sub action { #{{{
                       $config{$topdir}{$subdir}{lib}."\n" : "";
        my $is_checkout=($action eq 'checkout');
 
                       $config{$topdir}{$subdir}{lib}."\n" : "";
        my $is_checkout=($action eq 'checkout');
 

+       $ENV{MR_REPO}=$dir;
+

        if ($is_checkout) {
                if (-d $dir) {
                        print "mr $action: $dir already exists, skipping checkout\n" if $verbose;
        if ($is_checkout) {
                if (-d $dir) {
                        print "mr $action: $dir already exists, skipping checkout\n" if $verbose;


@@ -439,8 +441,6 @@ sub action { #{{{
                }
        }
 
                }
        }
 

-       $ENV{MR_REPO}=$dir;
-

        my $skiptest=findcommand("skip", $dir, $topdir, $subdir, $is_checkout);
        my $command=findcommand($action, $dir, $topdir, $subdir, $is_checkout);
 
        my $skiptest=findcommand("skip", $dir, $topdir, $subdir, $is_checkout);
        my $command=findcommand($action, $dir, $topdir, $subdir, $is_checkout);
 


@@ -1027,7 +1027,12 @@ sub config { #{{{
 } #}}}
 
 sub register { #{{{
 } #}}}
 
 sub register { #{{{

-       if (! $config_overridden) {
+       if ($config_overridden) {
+               # 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=~/\/$/;