For the checkout command, MR_REPO was set to the name of the parent directory of...

diff --git a/debian/changelog b/debian/changelog
index 44bb058acb8a7b505139312ec202dd9fb2f88a15..c3fe4b6de1bd636827861dadb0e3156d78f01cbe 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ mr (0.29) UNRELEASED; urgency=low
 
   * Allow environment variables in section headers. Pass such headers
     through the shell to expand them. Closes: #480580
 
   * Allow environment variables in section headers. Pass such headers
     through the shell to expand them. Closes: #480580

+  * For the checkout command, MR_REPO was set to the name of the parent
+    directory of the directory to checkout. It is supposed to be the
+    path to the directory itself though; fixed this. Closes: #480424

 
  -- Joey Hess <joeyh@debian.org>  Mon, 12 May 2008 15:15:48 -0400
 
 
  -- Joey Hess <joeyh@debian.org>  Mon, 12 May 2008 15:15:48 -0400
 

diff --git a/mr b/mr
index bb98ba674df60d6c2cc9e46537c87bc09190a12c..55dbdeebbf93c3a8855807542231348ec2f26883 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);