aboutsummaryrefslogtreecommitdiffstats
path: root/Library
diff options
context:
space:
mode:
authorJack Nagel2013-12-02 12:44:28 -0600
committerJack Nagel2013-12-02 12:44:28 -0600
commit5df0f56c3e274a7a64eda654b55a5ac2ccc03a01 (patch)
tree94459136d41431af3377b4eb9f8f4e1a2275e501 /Library
parentd1da0bc1e48e012d0873bf6022b97fd83e64714f (diff)
downloadhomebrew-5df0f56c3e274a7a64eda654b55a5ac2ccc03a01.tar.bz2
unsatisfied_deps cannot be nil
Diffstat (limited to 'Library')
-rw-r--r--Library/Homebrew/formula_installer.rb9
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}"