diff --git a/Library/Homebrew/download_strategy.rb b/Library/Homebrew/download_strategy.rb index 30bb8d9a71..db09e10f0a 100644 --- a/Library/Homebrew/download_strategy.rb +++ b/Library/Homebrew/download_strategy.rb @@ -375,6 +375,7 @@ class CurlDownloadStrategy < AbstractFileDownloadStrategy def initialize(url, name, version, **meta) super + @try_partial = true @mirrors = meta.fetch(:mirrors, []) end @@ -523,7 +524,7 @@ class CurlDownloadStrategy < AbstractFileDownloadStrategy end def _curl_download(resolved_url, to, timeout) - curl_download resolved_url, to: to, timeout: timeout + curl_download resolved_url, to: to, try_partial: @try_partial, timeout: timeout end # Curl options to be always passed to curl, @@ -577,7 +578,7 @@ class HomebrewCurlDownloadStrategy < CurlDownloadStrategy def _curl_download(resolved_url, to, timeout) raise HomebrewCurlDownloadStrategyError, url unless Formula["curl"].any_version_installed? - curl_download resolved_url, to: to, timeout: timeout, use_homebrew_curl: true + curl_download resolved_url, to: to, try_partial: @try_partial, timeout: timeout, use_homebrew_curl: true end end @@ -656,7 +657,7 @@ class CurlPostDownloadStrategy < CurlDownloadStrategy query.nil? ? [url, "-X", "POST"] : [url, "-d", query] end - curl_download(*args, to: temporary_path, timeout: timeout) + curl_download(*args, to: temporary_path, try_partial: @try_partial, timeout: timeout) end end diff --git a/Library/Homebrew/utils/curl.rb b/Library/Homebrew/utils/curl.rb index 20792f25a5..f1dd65e450 100644 --- a/Library/Homebrew/utils/curl.rb +++ b/Library/Homebrew/utils/curl.rb @@ -161,7 +161,7 @@ module Utils result end - def curl_download(*args, to: nil, try_partial: true, **options) + def curl_download(*args, to: nil, try_partial: false, **options) destination = Pathname(to) destination.dirname.mkpath diff --git a/Library/Homebrew/utils/spdx.rb b/Library/Homebrew/utils/spdx.rb index 93e2d7d1d9..38e0183e92 100644 --- a/Library/Homebrew/utils/spdx.rb +++ b/Library/Homebrew/utils/spdx.rb @@ -34,8 +34,8 @@ module SPDX def download_latest_license_data!(to: DATA_PATH) data_url = "https://raw.githubusercontent.com/spdx/license-list-data/#{latest_tag}/json/" - curl_download("#{data_url}licenses.json", to: to/"spdx_licenses.json", try_partial: false) - curl_download("#{data_url}exceptions.json", to: to/"spdx_exceptions.json", try_partial: false) + curl_download("#{data_url}licenses.json", to: to/"spdx_licenses.json") + curl_download("#{data_url}exceptions.json", to: to/"spdx_exceptions.json") end def parse_license_expression(license_expression)