From c1fecab3651c876a88d5971bc2ed31fe30bd66cd Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Fri, 10 Feb 2012 17:21:48 -0600 Subject: Don't return nil from Formula#linked_keg Doing so was the result of a quick hack to fix the "deps installed as upgrades don't get linked" bug, but it was a mistake. Instead, always return the LinkedKegs entry as a Pathname object, and let callers be responsible for checking that it exists. Signed-off-by: Jack Nagel --- Library/Homebrew/cmd/install.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Library/Homebrew/cmd') diff --git a/Library/Homebrew/cmd/install.rb b/Library/Homebrew/cmd/install.rb index 5aa198f31..4a20dc7cb 100644 --- a/Library/Homebrew/cmd/install.rb +++ b/Library/Homebrew/cmd/install.rb @@ -12,7 +12,7 @@ module Homebrew extend self end unless ARGV.force? ARGV.formulae.each do |f| - if File.directory? HOMEBREW_REPOSITORY/"Library/LinkedKegs/#{f.name}" + if f.linked_keg.directory? raise "#{f} already installed\nTry: brew upgrade #{f}" end end unless ARGV.force? -- cgit v1.2.3