From 84a85b97ffaccb6d80450194c0108e8197b2e4d1 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Tue, 19 Jan 2016 10:14:59 +0000 Subject: [PATCH] Revert "formula_installed: tweak source build behaviour." This reverts commit 5dd200c6b40f4fa9cc3a70cbc9ca2885e4626943. Closes Homebrew/homebrew#47889. --- Library/Homebrew/cmd/fetch.rb | 12 +++--------- Library/Homebrew/formula_installer.rb | 9 ++------- 2 files changed, 5 insertions(+), 16 deletions(-) diff --git a/Library/Homebrew/cmd/fetch.rb b/Library/Homebrew/cmd/fetch.rb index 28a6c42114..fabe268e53 100644 --- a/Library/Homebrew/cmd/fetch.rb +++ b/Library/Homebrew/cmd/fetch.rb @@ -42,15 +42,9 @@ module Homebrew end def fetch_bottle?(f) - return false unless f.bottle - return true if ARGV.force_bottle? - return false unless f.pour_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 true if ARGV.force_bottle? && f.bottle + return false unless f.bottle && f.pour_bottle? + return false if ARGV.build_from_source? || ARGV.build_bottle? return false unless f.bottle.compatible_cellar? true end diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb index 3202ef8a67..c7e87cbf75 100644 --- a/Library/Homebrew/formula_installer.rb +++ b/Library/Homebrew/formula_installer.rb @@ -98,13 +98,8 @@ class FormulaInstaller def install_bottle_for?(dep, build) return pour_bottle? if dep == formula - # 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 unless dep.bottle - return false unless dep.pour_bottle? + return false if build_from_source? + return false unless dep.bottle && dep.pour_bottle? return false unless build.used_options.empty? return false unless dep.bottle.compatible_cellar? true