From: Joey Hess Date: Mon, 12 May 2008 19:23:44 +0000 (-0400) Subject: For the checkout command, MR_REPO was set to the name of the parent directory of... X-Git-Url: https://git.madduck.net/code/myrepos.git/commitdiff_plain/c2658ac188a6f6937d729752880e1473e932322c 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 --- diff --git a/debian/changelog b/debian/changelog index 44bb058..c3fe4b6 100644 --- 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 + * 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 Mon, 12 May 2008 15:15:48 -0400 diff --git a/mr b/mr index bb98ba6..55dbdee 100755 --- a/mr +++ b/mr @@ -425,6 +425,8 @@ sub action { #{{{ $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; @@ -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);