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

Merge pull request #16459 from apainintheneck/update-formula-json-for-keyless-fields

Browse Source 
formulary: allow for more keyless fields when loading from API
This commit is contained in:
Mike McQuaid 2024-01-10 13:17:14 +00:00 committed by GitHub
commit 398d7dba48
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Library/Homebrew/formulary.rb
View File

@ -165,7 +165,7 @@ module Formulary
json_formula = Homebrew::API.merge_variations(json_formula) json_formula = Homebrew::API.merge_variations(json_formula)
uses_from_macos_names = json_formula["uses_from_macos"]&.map do |dep| uses_from_macos_names = json_formula.fetch("uses_from_macos", []).map do |dep|
next dep unless dep.is_a? Hash next dep unless dep.is_a? Hash
dep.keys.first dep.keys.first
@ -382,12 +382,12 @@ module Formulary
self.class.instance_variable_get(:@oldnames_array) self.class.instance_variable_get(:@oldnames_array)
end end
@aliases_array = json_formula["aliases"] @aliases_array = json_formula.fetch("aliases", [])
def aliases def aliases
self.class.instance_variable_get(:@aliases_array) self.class.instance_variable_get(:@aliases_array)
end end
@versioned_formulae_array = json_formula["versioned_formulae"] @versioned_formulae_array = json_formula.fetch("versioned_formulae", [])
def versioned_formulae_names def versioned_formulae_names
self.class.instance_variable_get(:@versioned_formulae_array) self.class.instance_variable_get(:@versioned_formulae_array)
end end