mirrors/brew
1
0
Fork 0
mirror of https://github.com/Homebrew/brew.git synced 2025-07-14 16:09:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use separate collection for requirement deps

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

6
Library/Homebrew/formula_installer.rb
View File

@ -18,6 +18,7 @@ class FormulaInstaller
attr_accessor :tab, :options, :ignore_deps attr_accessor :tab, :options, :ignore_deps
attr_accessor :show_summary_heading, :show_header attr_accessor :show_summary_heading, :show_header
attr_reader :unsatisfied_deps attr_reader :unsatisfied_deps
attr_reader :requirement_deps
def initialize ff def initialize ff
@f = ff @f = ff
@ -26,6 +27,7 @@ class FormulaInstaller
@options = Options.new @options = Options.new
@tab = Tab.dummy_tab(ff) @tab = Tab.dummy_tab(ff)
@unsatisfied_deps = [] @unsatisfied_deps = []
@requirement_deps = []
@@attempted ||= Set.new @@attempted ||= Set.new
@ -182,7 +184,7 @@ class FormulaInstaller
elsif req.satisfied? elsif req.satisfied?
Requirement.prune Requirement.prune
elsif req.default_formula? elsif req.default_formula?
unsatisfied_deps << req.to_dependency requirement_deps << req.to_dependency
Requirement.prune Requirement.prune
else else
puts "#{dependent}: #{req.message}" puts "#{dependent}: #{req.message}"
@ -233,6 +235,7 @@ class FormulaInstaller
end end
def install_dependencies def install_dependencies
unsatisfied_deps.concat(requirement_deps)
unsatisfied_deps.concat(filter_deps) unsatisfied_deps.concat(filter_deps)
if unsatisfied_deps.length > 1 if unsatisfied_deps.length > 1
@ -248,6 +251,7 @@ class FormulaInstaller
end end
@show_header = true unless unsatisfied_deps.empty? @show_header = true unless unsatisfied_deps.empty?
ensure ensure
requirement_deps.clear
unsatisfied_deps.clear unsatisfied_deps.clear
end end