admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Fix downloads directory not being created.

Browse Source
This commit is contained in:
Markus Reiter 2018-09-05 00:38:19 +02:00
parent beb6656278
commit 2ca3439ada
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Library/Homebrew/download_strategy.rb
View File

@ -292,6 +292,7 @@ class CurlDownloadStrategy < AbstractFileDownloadStrategy
raise CurlDownloadStrategyError, url raise CurlDownloadStrategyError, url
end end
ignore_interrupts do ignore_interrupts do
cached_location.dirname.mkpath
temporary_path.rename(cached_location) temporary_path.rename(cached_location)
symlink_location.dirname.mkpath symlink_location.dirname.mkpath
end end
@ -347,8 +348,6 @@ class CurlDownloadStrategy < AbstractFileDownloadStrategy
end end
def _fetch(url:, resolved_url:) def _fetch(url:, resolved_url:)
temporary_path.dirname.mkpath
ohai "Downloading from #{resolved_url}" if url != resolved_url ohai "Downloading from #{resolved_url}" if url != resolved_url
if ENV["HOMEBREW_NO_INSECURE_REDIRECT"] && if ENV["HOMEBREW_NO_INSECURE_REDIRECT"] &&

6
Library/Homebrew/utils/curl.rb
View File

@ -47,8 +47,10 @@ def curl(*args)
end end
def curl_download(*args, to: nil, continue_at: "-", **options) def curl_download(*args, to: nil, continue_at: "-", **options)
had_incomplete_download ||= File.exist?(to) destination = Pathname(to)
curl("--location", "--remote-time", "--continue-at", continue_at.to_s, "--output", to, *args, **options) had_incomplete_download ||= destination.exist?
destination.dirname.mkpath
curl("--location", "--remote-time", "--continue-at", continue_at.to_s, "--output", destination, *args, **options)
rescue ErrorDuringExecution => e rescue ErrorDuringExecution => e
# `curl` error 33: HTTP server doesn't seem to support byte ranges. Cannot resume. # `curl` error 33: HTTP server doesn't seem to support byte ranges. Cannot resume.
# HTTP status 416: Requested range not satisfiable # HTTP status 416: Requested range not satisfiable