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

download_queue: fix patch handling.

Browse Source 
These were being downloaded twice simultaneously which causes a locking
race condition.

While we're here, also improve the output of bottle manifests and
patches in the download queue.
This commit is contained in:
Mike McQuaid 2025-08-01 16:56:24 +01:00
parent d746234dcd
commit ebd4ad6077
No known key found for this signature in database
2 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Library/Homebrew/resource.rb
View File

@ -137,12 +137,13 @@ class Resource
verify_download_integrity: T::Boolean, verify_download_integrity: T::Boolean,
timeout: T.nilable(T.any(Integer, Float)), timeout: T.nilable(T.any(Integer, Float)),
quiet: T::Boolean, quiet: T::Boolean,
skip_patches: T::Boolean,
).returns(Pathname) ).returns(Pathname)
} }
def fetch(verify_download_integrity: true, timeout: nil, quiet: false) def fetch(verify_download_integrity: true, timeout: nil, quiet: false, skip_patches: false)
fetch_patches fetch_patches unless skip_patches
super super(verify_download_integrity:, timeout:, quiet:)
end end
# {Livecheck} can be used to check for newer versions of the software. # {Livecheck} can be used to check for newer versions of the software.
@ -345,6 +346,9 @@ class Resource
sig { override.returns(String) } sig { override.returns(String) }
def download_type = "Bottle Manifest" def download_type = "Bottle Manifest"
sig { override.returns(String) }
def name = bottle.name
private private
def manifest_annotations def manifest_annotations
@ -400,6 +404,15 @@ class Resource
sig { override.returns(String) } sig { override.returns(String) }
def download_type = "Patch" def download_type = "Patch"
sig { override.returns(String) }
def name
if (url = self.url)
url.to_s.split("/").last
else
super
end
end
end end
end end

6
Library/Homebrew/retryable_download.rb
View File

@ -60,7 +60,11 @@ module Homebrew
already_downloaded = downloadable.downloaded? already_downloaded = downloadable.downloaded?
download = downloadable.fetch(verify_download_integrity: false, timeout:, quiet:) download = if downloadable.is_a?(Resource) && (resource = T.cast(downloadable, Resource))
resource.fetch(verify_download_integrity: false, timeout:, quiet:, skip_patches: true)
else
downloadable.fetch(verify_download_integrity: false, timeout:, quiet:)
end
return download unless download.file? return download unless download.file?