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

formula_installer: install deps of dep before dep

Browse Source 
Dependencies/requirements of a dependency need to be installed/satisfied
before the dependency. The fact that @pour_failed may be false is
irrelevant to that imperative if we weren't pouring to begin with, so
this commit now checks for that case as well.
This commit is contained in:
ilovezfs 2016-09-01 03:51:05 -07:00
parent 6622b565ee
commit 6217e5200e
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
if pour_bottle?(:warn => true)
pour_bottle = pour_bottle?(:warn => true)
if pour_bottle
begin
install_relocation_tools unless formula.bottle_specification.skip_relocation?
pour
@ -242,7 +243,10 @@ class FormulaInstaller
build_bottle_preinstall if build_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
clean
end