Pass -L to curl to allow it to follow redirects when bootstrapping. (Pavel Avgustinov)

diff --git a/debian/changelog b/debian/changelog
index 8ba415951f056ce74bf598c25179cd1f6251ea13..ca820b580cc11e6535969dac99f123b7995cdcb7 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mr (0.47) UNRELEASED; urgency=low
+
+  * Pass -L to curl to allow it to follow redirects when bootstrapping.
+    (Pavel Avgustinov)
+
+ -- Joey Hess <joeyh@debian.org>  Sun, 13 Dec 2009 13:04:53 -0500
+

 mr (0.46) unstable; urgency=low
 
   * Avoid using abs_path to determine canonical repo path, as that fails
 mr (0.46) unstable; urgency=low
 
   * Avoid using abs_path to determine canonical repo path, as that fails

diff --git a/mr b/mr
index 1a57570f9953dff1c3e5ec59b201daeed904ee36..0bf66553c08a2dc5556810b1d11359f00e3dd973 100755 (executable)
--- a/mr
+++ b/mr
@@ -1359,7 +1359,7 @@ sub bootstrap {
        eval q{use File::Temp};
        die $@ if $@;
        my $tmpconfig=File::Temp->new();
        eval q{use File::Temp};
        die $@ if $@;
        my $tmpconfig=File::Temp->new();

-       my @curlargs = ("curl", "-A", "mr", "-s", $url, "-o", $tmpconfig);
+       my @curlargs = ("curl", "-A", "mr", "-L", "-s", $url, "-o", $tmpconfig);

        push(@curlargs, "-k") if $insecure;
        my $curlstatus = system(@curlargs);
        die "mr bootstrap: invalid SSL certificate for $url (consider -k)\n" if $curlstatus >> 8 == 60;
        push(@curlargs, "-k") if $insecure;
        my $curlstatus = system(@curlargs);
        die "mr bootstrap: invalid SSL certificate for $url (consider -k)\n" if $curlstatus >> 8 == 60;