diff options
| -rw-r--r-- | Changes | 1 | ||||
| -rw-r--r-- | urpm/download.pm | 7 |
2 files changed, 2 insertions, 6 deletions
@@ -1,5 +1,6 @@ - library: o prefer wget to curl as the default downloader (mga#24362) + o fix curl options to allow it to follow HTTP redirections (mga#31339) - cpan_testers: o Skip mirrorlist tests if there's only one broken mirror such as on mga[1-6] - urpmq: diff --git a/urpm/download.pm b/urpm/download.pm index 2d10f9ce..e09bb854 100644 --- a/urpm/download.pm +++ b/urpm/download.pm @@ -478,11 +478,6 @@ sub sync_curl { } } } - # Indicates whether this option is available in our curl - our $location_trusted; - if (!defined $location_trusted) { - $location_trusted = `/usr/bin/curl -h` =~ /location-trusted/ ? 1 : 0; - } #- http files (and other files) are correctly managed by curl wrt conditional download. #- options for ftp files, -R (-O <file>)* #- options for http files, -R (-O <file>)* @@ -500,7 +495,7 @@ sub sync_curl { ($options->{retry} ? ('--retry', $options->{retry}) : @{[]}), ($options->{quiet} ? "-s" : @{[]}), ($options->{"no-certificate-check"} ? "-k" : @{[]}), - $location_trusted ? "--location-trusted" : @{[]}, + "--location-trusted", "-R", "-f", "--disable-epsv", |