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

Split compute_and_install_dependencies

Browse Source 
This is so so that check_dependencies_bottled can be called when bottles
are being poured; implement check_dependencies_bottled
This commit is contained in:
William Woodruff 2015-06-23 19:21:55 -04:00 committed by Misty De Meo
parent 85187bf6d3
commit 76dcad7c82
1 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
Library/Homebrew/formula_installer.rb
View File

@ -147,7 +147,11 @@ class FormulaInstaller
check_conflicts check_conflicts
compute_and_install_dependencies unless ignore_deps? if !ignore_deps?
deps = compute_dependencies
check_dependencies_bottled(deps) if pour_bottle?
install_dependencies(deps)
end
return if only_deps? return if only_deps?
@ -217,18 +221,28 @@ class FormulaInstaller
raise FormulaConflictError.new(formula, conflicts) unless conflicts.empty? raise FormulaConflictError.new(formula, conflicts) unless conflicts.empty?
end end
def compute_and_install_dependencies def compute_dependencies
req_map, req_deps = expand_requirements req_map, req_deps = expand_requirements
check_requirements(req_map) check_requirements(req_map)
deps = expand_dependencies(req_deps + formula.deps) deps = expand_dependencies(req_deps + formula.deps)
if deps.empty? && only_deps? deps
puts "All dependencies for #{formula.full_name} are satisfied." end
else
install_dependencies(deps) def check_dependencies_bottled(deps)
unbottled = []
unbottled = deps.select do |dep, _|
formula = dep.to_formula
!formula.pour_bottle? && !MacOS.can_build?
end end
raise BuildToolsError.new(unbottled) unless unbottled.empty?
end
def compute_and_install_dependencies
deps = compute_dependencies
install_dependencies(deps)
end end
def check_requirements(req_map) def check_requirements(req_map)
@ -319,12 +333,13 @@ class FormulaInstaller
end end
def install_dependencies(deps) def install_dependencies(deps)
if deps.length > 1 if deps.empty? && only_deps?
puts "All dependencies for #{formula.full_name} are satisfied."
else
oh1 "Installing dependencies for #{formula.full_name}: #{Tty.green}#{deps.map(&:first)*", "}#{Tty.reset}" oh1 "Installing dependencies for #{formula.full_name}: #{Tty.green}#{deps.map(&:first)*", "}#{Tty.reset}"
deps.each { |dep, options| install_dependency(dep, options) }
end end
deps.each { |dep, options| install_dependency(dep, options) }
@show_header = true unless deps.empty? @show_header = true unless deps.empty?
end end