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

formula_installer: fix when bottle pouring when creating new bottle

Browse Source 
Formula#bottle_specification always exists, while Formula#bottle only
exists if the bottle is available and compatible.
This commit is contained in:
Xu Cheng 2015-08-22 14:19:16 +08:00
parent 62be981016
commit 9f20679366
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Library/Homebrew/formula_installer.rb
View File

@ -184,7 +184,7 @@ class FormulaInstaller
if pour_bottle?(:warn => true) if pour_bottle?(:warn => true)
begin begin
install_relocation_tools unless formula.bottle.skip_relocation? install_relocation_tools unless formula.bottle_specification.skip_relocation?
pour pour
rescue => e rescue => e
raise if ARGV.homebrew_developer? raise if ARGV.homebrew_developer?
@ -444,7 +444,9 @@ class FormulaInstaller
keg = Keg.new(formula.prefix) keg = Keg.new(formula.prefix)
link(keg) link(keg)
fix_install_names(keg) unless @poured_bottle && formula.bottle.skip_relocation? unless @poured_bottle && formula.bottle_specification.skip_relocation?
fix_install_names(keg)
end
if formula.post_install_defined? if formula.post_install_defined?
if build_bottle? if build_bottle?
@ -680,7 +682,7 @@ class FormulaInstaller
end end
keg = Keg.new(formula.prefix) keg = Keg.new(formula.prefix)
unless formula.bottle.skip_relocation? unless formula.bottle_specification.skip_relocation?
keg.relocate_install_names Keg::PREFIX_PLACEHOLDER, HOMEBREW_PREFIX.to_s, keg.relocate_install_names Keg::PREFIX_PLACEHOLDER, HOMEBREW_PREFIX.to_s,
Keg::CELLAR_PLACEHOLDER, HOMEBREW_CELLAR.to_s, :keg_only => formula.keg_only? Keg::CELLAR_PLACEHOLDER, HOMEBREW_CELLAR.to_s, :keg_only => formula.keg_only?
end end