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

fix regressions

Browse Source
This commit is contained in:
Douglas Eichelberger 2024-09-08 17:33:54 -07:00
parent 659dd59234
commit 0d44b110f9
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Library/Homebrew/formula_installer.rb
View File

@ -548,9 +548,9 @@ on_request: installed_on_request?, options:)
# Compute and collect the dependencies needed by the formula currently # Compute and collect the dependencies needed by the formula currently
# being installed. # being installed.
sig { params(use_cache: T::Boolean).returns(T::Array[[Dependency, T::Hash[String, Options]]]) } sig { params(use_cache: T::Boolean).returns(T::Array[[Dependency, Options]]) }
def compute_dependencies(use_cache: true) def compute_dependencies(use_cache: true)
@compute_dependencies = T.let(nil, T.nilable(T::Array[[Dependency, T::Hash[String, Options]]])) unless use_cache @compute_dependencies = T.let(nil, T.nilable(T::Array[[Dependency, Options]])) unless use_cache
@compute_dependencies ||= begin @compute_dependencies ||= begin
# Needs to be done before expand_dependencies # Needs to be done before expand_dependencies
fetch_bottle_tab if pour_bottle? fetch_bottle_tab if pour_bottle?
@ -560,7 +560,7 @@ on_request: installed_on_request?, options:)
end end
end end
sig { params(deps: T::Array[[Dependency, T::Hash[String, Options]]]).returns(T::Array[Formula]) } sig { params(deps: T::Array[[Dependency, Options]]).returns(T::Array[Formula]) }
def unbottled_dependencies(deps) def unbottled_dependencies(deps)
deps.map { |(dep, _options)| dep.to_formula }.reject do |dep_f| deps.map { |(dep, _options)| dep.to_formula }.reject do |dep_f|
next false unless dep_f.pour_bottle? next false unless dep_f.pour_bottle?
@ -666,7 +666,7 @@ on_request: installed_on_request?, options:)
end end
end end
sig { returns(T::Array[[Dependency, T::Hash[String, Options]]]) } sig { returns(T::Array[[Dependency, Options]]) }
def expand_dependencies def expand_dependencies
inherited_options = Hash.new { |hash, key| hash[key] = Options.new } inherited_options = Hash.new { |hash, key| hash[key] = Options.new }
@ -705,7 +705,7 @@ on_request: installed_on_request?, options:)
inherited_options inherited_options
end end
sig { params(deps: T::Array[[Dependency, T::Hash[String, Options]]]).void } sig { params(deps: T::Array[[Dependency, Options]]).void }
def install_dependencies(deps) def install_dependencies(deps)
if deps.empty? && only_deps? if deps.empty? && only_deps?
puts "All dependencies for #{formula.full_name} are satisfied." puts "All dependencies for #{formula.full_name} are satisfied."
@ -744,7 +744,7 @@ on_request: installed_on_request?, options:)
fi.fetch fi.fetch
end end
sig { params(dep: Dependency, inherited_options: T.any(Options, T::Hash[String, Options])).void } sig { params(dep: Dependency, inherited_options: Options).void }
def install_dependency(dep, inherited_options) def install_dependency(dep, inherited_options)
df = dep.to_formula df = dep.to_formula
@ -754,6 +754,8 @@ on_request: installed_on_request?, options:)
keg_had_linked_keg = true keg_had_linked_keg = true
keg_was_linked = linked_keg.linked? keg_was_linked = linked_keg.linked?
linked_keg.unlink linked_keg.unlink
else
keg_had_linked_keg = false
end end
if df.latest_version_installed? if df.latest_version_installed?