mr bootstrap: Fix cross-device rename failure. Closes: #557962

diff --git a/debian/changelog b/debian/changelog
index 0f7890e32f654e326a0a1ce72aa345ccff30e44c..c480160bc66970515f0d6eae46eec1d97fedd440 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ mr (0.44) UNRELEASED; urgency=low
   * Make mr -i pass -i to the shell, to ensure it knows it should be an
     interactive shell.
   * mr help: Support man on SunOS and OS X. (Geoff Davis)
+  * mr bootstrap: Fix cross-device rename failure. Closes: #557962
 
  -- Joey Hess <joeyh@debian.org>  Thu, 24 Sep 2009 21:52:27 -0400
 

diff --git a/mr b/mr
index ff4adced7c1b4de15da19a225493d914372769f6..98c96feb707865eed0aa56185b214f7f94a7738b 100755 (executable)
--- a/mr
+++ b/mr
@@ -1357,7 +1357,8 @@ sub bootstrap {
                print STDERR "mr: .mrconfig file already exists, not overwriting with $url\n";
        }
        else {
-               rename($tmpconfig, ".mrconfig") || die "rename: $!";
+               eval q{use File::Copy};
+               move($tmpconfig, ".mrconfig") || die "rename: $!";
        }
 
        exec("mr $ENV{MR_SWITCHES} -c .mrconfig checkout");