Merge pull request #14719 from MikeMcQuaid/no_api_root_url
formulary: use default bottle root_url.
This commit is contained in:
commit
6b7ecd18e9
@ -168,11 +168,10 @@ module Formulary
|
||||
|
||||
if (bottles_stable = json_formula["bottle"]["stable"]).present?
|
||||
bottle do
|
||||
if Homebrew::EnvConfig.bottle_domain != HOMEBREW_BOTTLE_DEFAULT_DOMAIN \
|
||||
&& bottles_stable["root_url"] == HOMEBREW_BOTTLE_DEFAULT_DOMAIN
|
||||
root_url Homebrew::EnvConfig.bottle_domain
|
||||
if Homebrew::EnvConfig.bottle_domain == HOMEBREW_BOTTLE_DEFAULT_DOMAIN
|
||||
root_url HOMEBREW_BOTTLE_DEFAULT_DOMAIN
|
||||
else
|
||||
root_url bottles_stable["root_url"]
|
||||
root_url Homebrew::EnvConfig.bottle_domain
|
||||
end
|
||||
rebuild bottles_stable["rebuild"]
|
||||
bottles_stable["files"].each do |tag, bottle_spec|
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user