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

bottle: Restore old filename for non-GitHub package URLs

Browse Source 
The fix for #11090 in bd3f1d28e78bbc3e632b5439f001c6a2b3032fd9 changed the bottle json content but the downloader still expects bottles at the old location.
This commit is contained in:
Kevin Abel 2021-04-11 14:15:27 -05:00
parent bf79e3d29b
commit b8d60c7fd6
No known key found for this signature in database
GPG Key ID: E0F7636DDDB96BF6
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Library/Homebrew/dev-cmd/bottle.rb
View File

@ -507,6 +507,12 @@ module Homebrew
return unless args.json? return unless args.json?
bottle_filename = if bottle.root_url.match?(GitHubPackages::URL_REGEX)
filename.github_packages
else
filename.bintray
end
json = { json = {
f.full_name => { f.full_name => {
"formula" => { "formula" => {
@ -532,7 +538,7 @@ module Homebrew
"date" => Pathname(local_filename).mtime.strftime("%F"), "date" => Pathname(local_filename).mtime.strftime("%F"),
"tags" => { "tags" => {
bottle_tag.to_s => { bottle_tag.to_s => {
"filename" => filename.github_packages, "filename" => bottle_filename,
"local_filename" => local_filename, "local_filename" => local_filename,
"sha256" => sha256, "sha256" => sha256,
"formulae_brew_sh_path" => formulae_brew_sh_path, "formulae_brew_sh_path" => formulae_brew_sh_path,