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

Merge pull request #835 from ilovezfs/install_deps_of_dep_before_dep

Browse Source 
formula_installer: install deps of dep before dep
This commit is contained in:
ilovezfs 2016-09-01 07:31:36 -07:00
commit 8bb3dda243
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Library/Homebrew/formula_installer.rb
View File

@ -219,7 +219,8 @@ class FormulaInstaller
@@attempted << formula @@attempted << formula
if pour_bottle?(:warn => true) pour_bottle = pour_bottle?(:warn => true)
if pour_bottle
begin begin
install_relocation_tools unless formula.bottle_specification.skip_relocation? install_relocation_tools unless formula.bottle_specification.skip_relocation?
pour pour
@ -242,7 +243,10 @@ class FormulaInstaller
build_bottle_preinstall if build_bottle? build_bottle_preinstall if build_bottle?
unless @poured_bottle unless @poured_bottle
compute_and_install_dependencies if @pour_failed && !ignore_deps? not_pouring = !pour_bottle || @pour_failed
if not_pouring && !ignore_deps?
compute_and_install_dependencies
end
build build
clean clean
end end