From f1fc0b788f215e4e977ba6de674d18b6e040ed18 Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Thu, 24 Jul 2014 19:39:09 -0500 Subject: [PATCH] Pass the keg object into link and fix_install_names --- Library/Homebrew/formula_installer.rb | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb index d1d991795f..641ce9a292 100644 --- a/Library/Homebrew/formula_installer.rb +++ b/Library/Homebrew/formula_installer.rb @@ -408,18 +408,20 @@ class FormulaInstaller install_plist + keg = Keg.new(f.prefix) + if f.keg_only? begin - Keg.new(f.prefix).optlink + keg.optlink rescue Exception onoe "Failed to create: #{f.opt_prefix}" puts "Things that depend on #{f} will probably not build." end else - link + link(keg) end - fix_install_names if OS.mac? + fix_install_names(keg) if OS.mac? post_install @@ -544,9 +546,7 @@ class FormulaInstaller raise end - def link - keg = Keg.new(f.prefix) - + def link(keg) if keg.linked? opoo "This keg was marked linked already, continuing anyway" keg.remove_linked_keg_record @@ -591,8 +591,7 @@ class FormulaInstaller ohai e, e.backtrace if debug? end - def fix_install_names - keg = Keg.new(f.prefix) + def fix_install_names(keg) keg.fix_install_names(:keg_only => f.keg_only?) if @poured_bottle