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

Merge pull request #6505 from sjackman/bottle-deps

Browse Source 
Install bottle deps only when a bottle was poured
This commit is contained in:
Mike McQuaid 2019-09-30 08:31:36 +01:00 committed by GitHub
commit e37d1d4622
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Library/Homebrew/formula_installer.rb
View File

@ -479,7 +479,6 @@ class FormulaInstaller
dependent, dependent,
inherited_options.fetch(dependent.name, []), inherited_options.fetch(dependent.name, []),
) )
pour_bottle = true if install_bottle_for?(dep.to_formula, build)
if dep.prune_from_option?(build) if dep.prune_from_option?(build)
Dependency.prune Dependency.prune
@ -491,6 +490,8 @@ class FormulaInstaller
Dependency.prune Dependency.prune
elsif dep.satisfied?(inherited_options[dep.name]) elsif dep.satisfied?(inherited_options[dep.name])
Dependency.skip Dependency.skip
else
pour_bottle ||= install_bottle_for?(dep.to_formula, build)
end end
end end