From bcc9002214955d588f323c0854ab3f4e2de9904f Mon Sep 17 00:00:00 2001 From: Kaito Udagawa Date: Sun, 20 Nov 2016 19:45:33 +0900 Subject: [PATCH] install: print nothing if `@requirement_messages` is a String or nil --- Library/Homebrew/formula_installer.rb | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb index e2af9779ca..19b6196255 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