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

Revert "formula_installed: tweak source build behaviour."

Browse Source 
This reverts commit 5dd200c6b40f4fa9cc3a70cbc9ca2885e4626943.

Closes Homebrew/homebrew#47889.
This commit is contained in:
Mike McQuaid 2016-01-19 10:14:59 +00:00
parent 44a264376b
commit 84a85b97ff
2 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Library/Homebrew/cmd/fetch.rb
View File

@ -42,15 +42,9 @@ module Homebrew
end end
def fetch_bottle?(f) def fetch_bottle?(f)
return false unless f.bottle return true if ARGV.force_bottle? && f.bottle
return true if ARGV.force_bottle? return false unless f.bottle && f.pour_bottle?
return false unless f.pour_bottle? return false if ARGV.build_from_source? || ARGV.build_bottle?
# We want to behave different with `--build-from-source` and
# ENV["HOMEBREW_BUILD_FROM_SOURCE"] because the latter implies you want
# everything built from source and the prior that you want just the
# formulae you've requested built from source.
return false if ENV["HOMEBREW_BUILD_FROM_SOURCE"]
return false if ARGV.build_bottle?
return false unless f.bottle.compatible_cellar? return false unless f.bottle.compatible_cellar?
true true
end end

9
Library/Homebrew/formula_installer.rb
View File

@ -98,13 +98,8 @@ class FormulaInstaller
def install_bottle_for?(dep, build) def install_bottle_for?(dep, build)
return pour_bottle? if dep == formula return pour_bottle? if dep == formula
# We want to behave different with `--build-from-source` and return false if build_from_source?
# ENV["HOMEBREW_BUILD_FROM_SOURCE"] because the latter implies you want return false unless dep.bottle && dep.pour_bottle?
# everything built from source and the prior that you want just the
# formulae you've requested built from source.
return false if ENV["HOMEBREW_BUILD_FROM_SOURCE"]
return false unless dep.bottle
return false unless dep.pour_bottle?
return false unless build.used_options.empty? return false unless build.used_options.empty?
return false unless dep.bottle.compatible_cellar? return false unless dep.bottle.compatible_cellar?
true true