diff options
| author | Jack Nagel | 2013-12-09 14:36:10 -0600 |
|---|---|---|
| committer | Jack Nagel | 2013-12-09 14:36:10 -0600 |
| commit | 0b9c29a66743cf2b0fd2128ba83b2bc8e7ad9e4c (patch) | |
| tree | 0ecfb5ca1eefc15386c2ef92a1d400b139b98757 /Library | |
| parent | 677c78d77e917c21dd23ad09add51f93a8c97097 (diff) | |
| download | brew-0b9c29a66743cf2b0fd2128ba83b2bc8e7ad9e4c.tar.bz2 | |
Use separate collection for requirement deps
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Homebrew/formula_installer.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb index 8d4f003d7..acfa77973 100644 --- a/Library/Homebrew/formula_installer.rb +++ b/Library/Homebrew/formula_installer.rb @@ -18,6 +18,7 @@ class FormulaInstaller attr_accessor :tab, :options, :ignore_deps attr_accessor :show_summary_heading, :show_header attr_reader :unsatisfied_deps + attr_reader :requirement_deps def initialize ff @f = ff @@ -26,6 +27,7 @@ class FormulaInstaller @options = Options.new @tab = Tab.dummy_tab(ff) @unsatisfied_deps = [] + @requirement_deps = [] @@attempted ||= Set.new @@ -182,7 +184,7 @@ class FormulaInstaller elsif req.satisfied? Requirement.prune elsif req.default_formula? - unsatisfied_deps << req.to_dependency + requirement_deps << req.to_dependency Requirement.prune else puts "#{dependent}: #{req.message}" @@ -233,6 +235,7 @@ class FormulaInstaller end def install_dependencies + unsatisfied_deps.concat(requirement_deps) unsatisfied_deps.concat(filter_deps) if unsatisfied_deps.length > 1 @@ -248,6 +251,7 @@ class FormulaInstaller end @show_header = true unless unsatisfied_deps.empty? ensure + requirement_deps.clear unsatisfied_deps.clear end |
