diff options
| author | Kaito Udagawa | 2016-11-20 19:45:33 +0900 |
|---|---|---|
| committer | Kaito Udagawa | 2016-11-20 19:49:58 +0900 |
| commit | bcc9002214955d588f323c0854ab3f4e2de9904f (patch) | |
| tree | 377ef56c710895be65d96a8e8f9ca262f0ad2253 /Library | |
| parent | 61c8fff0ee2717522a1fb971ca4ef7450df305b9 (diff) | |
| download | brew-bcc9002214955d588f323c0854ab3f4e2de9904f.tar.bz2 | |
install: print nothing if `@requirement_messages` is a String or nil
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Homebrew/formula_installer.rb | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb index e2af9779c..19b619625 100644 --- a/Library/Homebrew/formula_installer.rb +++ b/Library/Homebrew/formula_installer.rb @@ -52,6 +52,7 @@ class FormulaInstaller @debug = false @options = Options.new @invalid_option_names = [] + @requirement_messages = [] @@attempted ||= Set.new @@ -251,7 +252,7 @@ class FormulaInstaller opoo "Bottle installation failed: building from source." raise BuildToolsError, [formula] unless DevelopmentTools.installed? else - puts @requirement_messages + puts_requirement_messages @poured_bottle = true end end @@ -261,7 +262,7 @@ class FormulaInstaller unless @poured_bottle not_pouring = !pour_bottle || @pour_failed compute_and_install_dependencies if not_pouring && !ignore_deps? - puts @requirement_messages + puts_requirement_messages build clean @@ -349,7 +350,7 @@ class FormulaInstaller return if fatals.empty? - puts @requirement_messages + puts_requirement_messages raise UnsatisfiedRequirements, fatals end @@ -837,4 +838,10 @@ class FormulaInstaller @@locked.clear @hold_locks = false end + + def puts_requirement_messages + return unless @requirement_messages + return if @requirement_messages.empty? + puts @requirement_messages + end end |
