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

Merge pull request #14719 from MikeMcQuaid/no_api_root_url

Browse Source 
formulary: use default bottle root_url.
This commit is contained in:
Mike McQuaid 2023-02-20 10:21:43 +00:00 committed by GitHub
commit 6b7ecd18e9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Library/Homebrew/formulary.rb
View File

@ -168,11 +168,10 @@ module Formulary
if (bottles_stable = json_formula["bottle"]["stable"]).present? if (bottles_stable = json_formula["bottle"]["stable"]).present?
bottle do bottle do
if Homebrew::EnvConfig.bottle_domain != HOMEBREW_BOTTLE_DEFAULT_DOMAIN \ if Homebrew::EnvConfig.bottle_domain == HOMEBREW_BOTTLE_DEFAULT_DOMAIN
&& bottles_stable["root_url"] == HOMEBREW_BOTTLE_DEFAULT_DOMAIN root_url HOMEBREW_BOTTLE_DEFAULT_DOMAIN
root_url Homebrew::EnvConfig.bottle_domain
else else
root_url bottles_stable["root_url"] root_url Homebrew::EnvConfig.bottle_domain
end end
rebuild bottles_stable["rebuild"] rebuild bottles_stable["rebuild"]
bottles_stable["files"].each do |tag, bottle_spec| bottles_stable["files"].each do |tag, bottle_spec|