admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Pass the keg object into link and fix_install_names

Browse Source
This commit is contained in:
Jack Nagel 2014-07-24 19:39:09 -05:00
parent d2d2b3c888
commit f1fc0b788f
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Library/Homebrew/formula_installer.rb
View File

@ -408,18 +408,20 @@ class FormulaInstaller
install_plist install_plist
keg = Keg.new(f.prefix)
if f.keg_only? if f.keg_only?
begin begin
Keg.new(f.prefix).optlink keg.optlink
rescue Exception rescue Exception
onoe "Failed to create: #{f.opt_prefix}" onoe "Failed to create: #{f.opt_prefix}"
puts "Things that depend on #{f} will probably not build." puts "Things that depend on #{f} will probably not build."
end end
else else
link link(keg)
end end
fix_install_names if OS.mac? fix_install_names(keg) if OS.mac?
post_install post_install
@ -544,9 +546,7 @@ class FormulaInstaller
raise raise
end end
def link def link(keg)
keg = Keg.new(f.prefix)
if keg.linked? if keg.linked?
opoo "This keg was marked linked already, continuing anyway" opoo "This keg was marked linked already, continuing anyway"
keg.remove_linked_keg_record keg.remove_linked_keg_record
@ -591,8 +591,7 @@ class FormulaInstaller
ohai e, e.backtrace if debug? ohai e, e.backtrace if debug?
end end
def fix_install_names def fix_install_names(keg)
keg = Keg.new(f.prefix)
keg.fix_install_names(:keg_only => f.keg_only?) keg.fix_install_names(:keg_only => f.keg_only?)
if @poured_bottle if @poured_bottle