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

unsatisfied_deps cannot be nil

Browse Source
This commit is contained in:
Jack Nagel 2013-12-02 12:44:28 -06:00
parent 2b23c163af
commit 24a853ebe5
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Library/Homebrew/formula_installer.rb
View File

@ -17,6 +17,7 @@ class FormulaInstaller
attr_reader :f attr_reader :f
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
def initialize ff def initialize ff
@f = ff @f = ff
@ -24,6 +25,7 @@ class FormulaInstaller
@ignore_deps = ARGV.ignore_deps? || ARGV.interactive? @ignore_deps = ARGV.ignore_deps? || ARGV.interactive?
@options = Options.new @options = Options.new
@tab = Tab.dummy_tab(ff) @tab = Tab.dummy_tab(ff)
@unsatisfied_deps = []
@@attempted ||= Set.new @@attempted ||= Set.new
@ -234,12 +236,9 @@ class FormulaInstaller
f.recursive_dependencies.select { |d| deps.include? d } f.recursive_dependencies.select { |d| deps.include? d }
end end
def unsatisfied_deps
@unsatisfied_deps ||= filter_deps
end
def install_dependencies 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 if unsatisfied_deps.length > 1
oh1 "Installing dependencies for #{f}: #{Tty.green}#{unsatisfied_deps*", "}#{Tty.reset}" oh1 "Installing dependencies for #{f}: #{Tty.green}#{unsatisfied_deps*", "}#{Tty.reset}"