aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Homebrew/cmd
diff options
context:
space:
mode:
authorMike McQuaid2016-01-19 10:14:59 +0000
committerMike McQuaid2016-01-19 10:16:59 +0000
commit84a85b97ffaccb6d80450194c0108e8197b2e4d1 (patch)
tree13dec4cf307b9e21f56386bbac0f2091836d764a /Library/Homebrew/cmd
parent44a264376bd802bb6fec2117e8feb0e076871297 (diff)
downloadbrew-84a85b97ffaccb6d80450194c0108e8197b2e4d1.tar.bz2
Revert "formula_installed: tweak source build behaviour."
This reverts commit 5dd200c6b40f4fa9cc3a70cbc9ca2885e4626943. Closes Homebrew/homebrew#47889.
Diffstat (limited to 'Library/Homebrew/cmd')
-rw-r--r--Library/Homebrew/cmd/fetch.rb12
1 files changed, 3 insertions, 9 deletions
diff --git a/Library/Homebrew/cmd/fetch.rb b/Library/Homebrew/cmd/fetch.rb
index 28a6c4211..fabe268e5 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