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

Move dependency expansion logic up one level

Browse Source
This commit is contained in:
Jack Nagel 2013-12-09 14:36:10 -06:00
parent 0b9c29a667
commit be5f9545dd
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Library/Homebrew/formula_installer.rb
View File

@ -171,7 +171,14 @@ class FormulaInstaller
def compute_and_install_dependencies def compute_and_install_dependencies
perform_readline_hack perform_readline_hack
check_requirements check_requirements
install_dependencies
unsatisfied_deps.concat(requirement_deps)
unsatisfied_deps.concat(filter_deps)
install_dependencies(unsatisfied_deps)
ensure
requirement_deps.clear
unsatisfied_deps.clear
end end
def check_requirements def check_requirements
@ -234,25 +241,19 @@ class FormulaInstaller
f.recursive_dependencies.select { |d| deps.include? d } f.recursive_dependencies.select { |d| deps.include? d }
end end
def install_dependencies def install_dependencies(deps)
unsatisfied_deps.concat(requirement_deps) if deps.length > 1
unsatisfied_deps.concat(filter_deps) oh1 "Installing dependencies for #{f}: #{Tty.green}#{deps*", "}#{Tty.reset}"
if unsatisfied_deps.length > 1
oh1 "Installing dependencies for #{f}: #{Tty.green}#{unsatisfied_deps*", "}#{Tty.reset}"
end end
unsatisfied_deps.each do |dep| deps.each do |dep|
if dep.requested? if dep.requested?
install_dependency(dep) install_dependency(dep)
else else
ARGV.filter_for_dependencies { install_dependency(dep) } ARGV.filter_for_dependencies { install_dependency(dep) }
end end
end end
@show_header = true unless unsatisfied_deps.empty? @show_header = true unless deps.empty?
ensure
requirement_deps.clear
unsatisfied_deps.clear
end end
def install_dependency dep def install_dependency dep