diff options
| author | Jack Nagel | 2013-12-02 12:44:28 -0600 |
|---|---|---|
| committer | Jack Nagel | 2013-12-02 12:44:28 -0600 |
| commit | 24a853ebe5de53d78c95d55052d7a0fa6214bb57 (patch) | |
| tree | 71fba7c178bfa12c142b58932c36941c95702e6b /Library/Homebrew | |
| parent | 2b23c163af13ab008e480a0447ec02e1f7c95c36 (diff) | |
| download | brew-24a853ebe5de53d78c95d55052d7a0fa6214bb57.tar.bz2 | |
unsatisfied_deps cannot be nil
Diffstat (limited to 'Library/Homebrew')
| -rw-r--r-- | Library/Homebrew/formula_installer.rb | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb index 996e6f7fa..60d9ef417 100644 --- a/Library/Homebrew/formula_installer.rb +++ b/Library/Homebrew/formula_installer.rb @@ -17,6 +17,7 @@ class FormulaInstaller attr_reader :f attr_accessor :tab, :options, :ignore_deps attr_accessor :show_summary_heading, :show_header + attr_reader :unsatisfied_deps def initialize ff @f = ff @@ -24,6 +25,7 @@ class FormulaInstaller @ignore_deps = ARGV.ignore_deps? || ARGV.interactive? @options = Options.new @tab = Tab.dummy_tab(ff) + @unsatisfied_deps = [] @@attempted ||= Set.new @@ -234,12 +236,9 @@ class FormulaInstaller f.recursive_dependencies.select { |d| deps.include? d } end - def unsatisfied_deps - @unsatisfied_deps ||= filter_deps - end - def install_dependencies - @unsatisfied_deps = nil if @pour_failed + unsatisfied_deps.clear if @pour_failed + unsatisfied_deps.concat(filter_deps) if unsatisfied_deps.length > 1 oh1 "Installing dependencies for #{f}: #{Tty.green}#{unsatisfied_deps*", "}#{Tty.reset}" |
