aboutsummaryrefslogtreecommitdiffstats
path: root/Library
diff options
context:
space:
mode:
authorXu Cheng2015-05-17 20:35:32 +0800
committerXu Cheng2015-05-27 13:53:41 +0800
commitfb8548cae583f806d1018fd40621952b1ee42ff3 (patch)
treee9b3011a02b07776392896c789962a1edf65be1d /Library
parentc14794baa8f17dc7d933e5ef9559302707b7a801 (diff)
downloadbrew-fb8548cae583f806d1018fd40621952b1ee42ff3.tar.bz2
link: load formula from rack
Diffstat (limited to 'Library')
-rw-r--r--Library/Homebrew/cmd/link.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/Library/Homebrew/cmd/link.rb b/Library/Homebrew/cmd/link.rb
index 4a83a2ca1..98b10cb0f 100644
--- a/Library/Homebrew/cmd/link.rb
+++ b/Library/Homebrew/cmd/link.rb
@@ -14,7 +14,7 @@ module Homebrew
opoo "Already linked: #{keg}"
puts "To relink: brew unlink #{keg.name} && brew link #{keg.name}"
next
- elsif keg_only?(keg.name) && !ARGV.force?
+ elsif keg_only?(keg.rack) && !ARGV.force?
opoo "#{keg.name} is keg-only and must be linked with --force"
puts "Note that doing so can interfere with building software."
next
@@ -48,9 +48,9 @@ module Homebrew
private
- def keg_only?(name)
- Formulary.factory(name).keg_only?
- rescue FormulaUnavailableError
+ def keg_only?(rack)
+ Formulary.from_rack(rack).keg_only?
+ rescue FormulaUnavailableError, TapFormulaAmbiguityError
false
end
end