aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Vandenberg2011-07-30 10:11:35 -0700
committerAdam Vandenberg2011-07-30 10:11:35 -0700
commit20d2edf18deefb6d6439d415625f506c662dcba2 (patch)
treef9ca763c4da001459d8137f3437f1ed7c4ebd100
parentc764712f19aef2d4cb65d6cdd2177a059f36f376 (diff)
downloadhomebrew-20d2edf18deefb6d6439d415625f506c662dcba2.tar.bz2
Fix stripping of keg-only reasons
-rw-r--r--Library/Homebrew/formula.rb4
-rwxr-xr-xLibrary/Homebrew/install.rb2
2 files changed, 3 insertions, 3 deletions
diff --git a/Library/Homebrew/formula.rb b/Library/Homebrew/formula.rb
index 5c330ee4f..d0f6a0389 100644
--- a/Library/Homebrew/formula.rb
+++ b/Library/Homebrew/formula.rb
@@ -65,14 +65,14 @@ class KegOnlyReason
def to_s
if @reason == :provided_by_osx
- <<-EOS.chomp
+ <<-EOS.strip
Mac OS X already provides this program and installing another version in
parallel can cause all kinds of trouble.
#{@explanation}
EOS
else
- @reason
+ @reason.strip
end
end
end
diff --git a/Library/Homebrew/install.rb b/Library/Homebrew/install.rb
index 8cbcb0c2a..e92e80e08 100755
--- a/Library/Homebrew/install.rb
+++ b/Library/Homebrew/install.rb
@@ -5,7 +5,7 @@ def text_for_keg_only_formula f
<<-EOS
This formula is keg-only, so it was not symlinked into #{HOMEBREW_PREFIX}.
-#{f.keg_only?.strip}
+#{f.keg_only?}
Generally there are no consequences of this for you.
If you build your own software and it requires this formula, you'll need