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

formula_installer: pass cache key to Dependency.expand

Browse Source
This commit is contained in:
Bo Anderson 2021-03-29 13:20:18 +01:00
parent 5361c04c49
commit 22053ca2c3
No known key found for this signature in database
GPG Key ID: 3DB94E204E137D65
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Library/Homebrew/formula_installer.rb
View File

@ -502,9 +502,8 @@ class FormulaInstaller
# being installed. # being installed.
def compute_dependencies def compute_dependencies
@compute_dependencies ||= begin @compute_dependencies ||= begin
req_map, req_deps = expand_requirements check_requirements(expand_requirements)
check_requirements(req_map) expand_dependencies
expand_dependencies(req_deps + formula.deps)
end end
end end
@ -550,7 +549,6 @@ class FormulaInstaller
def expand_requirements def expand_requirements
unsatisfied_reqs = Hash.new { |h, k| h[k] = [] } unsatisfied_reqs = Hash.new { |h, k| h[k] = [] }
req_deps = []
formulae = [formula] formulae = [formula]
formula_deps_map = formula.recursive_dependencies formula_deps_map = formula.recursive_dependencies
.index_by(&:name) .index_by(&:name)
@ -577,17 +575,16 @@ class FormulaInstaller
end end
end end
# Merge the repeated dependencies, which may have different tags. unsatisfied_reqs
req_deps = Dependency.merge_repeats(req_deps)
[unsatisfied_reqs, req_deps]
end end
def expand_dependencies(deps) def expand_dependencies
inherited_options = Hash.new { |hash, key| hash[key] = Options.new } inherited_options = Hash.new { |hash, key| hash[key] = Options.new }
pour_bottle = pour_bottle? pour_bottle = pour_bottle?
expanded_deps = Dependency.expand(formula, deps) do |dependent, dep| # Cache for this expansion only. FormulaInstaller has a lot of inputs which can alter expansion.
cache_key = "FormulaInstaller-#{formula.full_name}-#{Time.now.to_f}"
expanded_deps = Dependency.expand(formula, cache_key: cache_key) do |dependent, dep|
inherited_options[dep.name] |= inherited_options_for(dep) inherited_options[dep.name] |= inherited_options_for(dep)
build = effective_build_options_for( build = effective_build_options_for(
dependent, dependent,