Push keg_only special-case into link

1 files changed, 11 insertions, 12 deletions

diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb
index 641ce9a29..723c35d91 100644
--- a/Library/Homebrew/formula_installer.rb
+++ b/Library/Homebrew/formula_installer.rb
@@ -409,18 +409,7 @@ class FormulaInstaller
     install_plist
 
     keg = Keg.new(f.prefix)
-
-    if f.keg_only?
-      begin
-        keg.optlink
-      rescue Exception
-        onoe "Failed to create: #{f.opt_prefix}"
-        puts "Things that depend on #{f} will probably not build."
-      end
-    else
-      link(keg)
-    end
-
+    link(keg)
     fix_install_names(keg) if OS.mac?
 
     post_install
@@ -547,6 +536,16 @@ class FormulaInstaller
   end
 
   def link(keg)
+    if f.keg_only?
+      begin
+        keg.optlink
+      rescue Exception
+        onoe "Failed to create: #{f.opt_prefix}"
+        puts "Things that depend on #{f} will probably not build."
+      end
+      return
+    end
+
     if keg.linked?
       opoo "This keg was marked linked already, continuing anyway"
       keg.remove_linked_keg_record