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

Revert "formula_installer: bottle against Homebrew Python."

Browse Source 
This reverts commit dc53c331ebb3bf752655a6e2147ea90c38a22e2f.

Closes Homebrew/homebrew#30302.
Closes Homebrew/homebrew#30305.
This commit is contained in:
Mike McQuaid 2014-06-20 19:48:09 +01:00
parent cc6af6c050
commit 9ccf965553
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Library/Homebrew/formula_installer.rb
View File

@ -58,6 +58,14 @@ class FormulaInstaller
return true if f.local_bottle_path return true if f.local_bottle_path
return false unless f.bottle && f.pour_bottle? return false unless f.bottle && f.pour_bottle?
f.requirements.each do |req|
next if req.optional? || req.pour_bottle?
if install_bottle_options[:warn]
ohai "Building source; bottle blocked by #{req} requirement"
end
return false
end
unless f.bottle.compatible_cellar? unless f.bottle.compatible_cellar?
if install_bottle_options[:warn] if install_bottle_options[:warn]
opoo "Building source; cellar of #{f}'s bottle is #{f.bottle.cellar}" opoo "Building source; cellar of #{f}'s bottle is #{f.bottle.cellar}"
@ -257,8 +265,7 @@ class FormulaInstaller
Requirement.prune Requirement.prune
elsif req.build? && dependent != f && install_bottle_for_dep?(dependent, build) elsif req.build? && dependent != f && install_bottle_for_dep?(dependent, build)
Requirement.prune Requirement.prune
elsif req.satisfied? && !(pour_bottle? || build_bottle?) \ elsif req.satisfied?
&& !(!req.optional? && req.default_formula?)
Requirement.prune Requirement.prune
elsif req.default_formula? elsif req.default_formula?
dep = req.to_dependency dep = req.to_dependency