From fca07369ab5c81d3abaa77841b9403a73efa2f78 Mon Sep 17 00:00:00 2001 From: Adam Vandenberg Date: Tue, 20 Dec 2011 20:11:54 -0800 Subject: [PATCH] Omit empty caveats --- Library/Homebrew/cmd/info.rb | 3 ++- Library/Homebrew/formula_installer.rb | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Library/Homebrew/cmd/info.rb b/Library/Homebrew/cmd/info.rb index 72348fc5c8..5872f88345 100644 --- a/Library/Homebrew/cmd/info.rb +++ b/Library/Homebrew/cmd/info.rb @@ -70,7 +70,8 @@ module Homebrew extend self end end - if f.caveats + the_caveats = (f.caveats || "").strip + unless the_caveats.empty? puts puts f.caveats puts diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb index 7a2ee653c8..eee2ae6357 100644 --- a/Library/Homebrew/formula_installer.rb +++ b/Library/Homebrew/formula_installer.rb @@ -72,10 +72,12 @@ class FormulaInstaller end def caveats - if f.caveats + the_caveats = (f.caveats || "").strip + unless the_caveats.empty? ohai "Caveats", f.caveats @show_summary_heading = true end + if f.keg_only? ohai 'Caveats', f.keg_only_text @show_summary_heading = true