aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Homebrew/utils
diff options
context:
space:
mode:
authorMarkus Reiter2017-09-10 07:23:18 +0200
committerMarkus Reiter2017-09-10 07:23:18 +0200
commit1f66c9c9e0b678cc8f7b72d12f29ab6d25bd8eb8 (patch)
tree42510d1416b7c7c0aee8ea60c6a230375d481e6a /Library/Homebrew/utils
parent914378cf2ef8104a4659772945e5f77945ea16cd (diff)
downloadbrew-1f66c9c9e0b678cc8f7b72d12f29ab6d25bd8eb8.tar.bz2
Let `curl_download` handle HTTP 416 error.
Diffstat (limited to 'Library/Homebrew/utils')
-rw-r--r--Library/Homebrew/utils/curl.rb5
1 files changed, 4 insertions, 1 deletions
diff --git a/Library/Homebrew/utils/curl.rb b/Library/Homebrew/utils/curl.rb
index bc7055c0c..7807d2034 100644
--- a/Library/Homebrew/utils/curl.rb
+++ b/Library/Homebrew/utils/curl.rb
@@ -38,11 +38,14 @@ def curl(*args)
end
def curl_download(*args, to: nil, continue_at: "-", **options)
+ had_incomplete_download ||= File.exist?(to)
curl("--location", "--remote-time", "--continue-at", continue_at.to_s, "--output", to, *args, **options)
rescue ErrorDuringExecution
# `curl` error 33: HTTP server doesn't seem to support byte ranges. Cannot resume.
- if $CHILD_STATUS.exitstatus == 33 && continue_at == "-"
+ # HTTP status 416: Requested range not satisfiable
+ if ($CHILD_STATUS.exitstatus == 33 || had_incomplete_download) && continue_at == "-"
continue_at = 0
+ had_incomplete_download = false
retry
end