aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorilovezfs2017-09-30 19:25:01 -0700
committerGitHub2017-09-30 19:25:01 -0700
commitd62d496e36f6f38c6eba5a2d8a9216d62fc3a3fc (patch)
treefbb68bb3a78ee64510bdb9333ffa97287b7dcf02
parent700300a76b3513b975714aeea52dfd63eec3dc76 (diff)
parenta4838d22f4cd9b078a6cf641753caef562071386 (diff)
downloadbrew-d62d496e36f6f38c6eba5a2d8a9216d62fc3a3fc.tar.bz2
Merge pull request #3250 from sjackman/pour-bottle
pour_bottle?: Check bottle.compatible_cellar?
-rw-r--r--Library/Homebrew/formula_installer.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb
index 845152e24..56238ad73 100644
--- a/Library/Homebrew/formula_installer.rb
+++ b/Library/Homebrew/formula_installer.rb
@@ -100,11 +100,12 @@ class FormulaInstaller
return false
end
- unless formula.bottled?
+ bottle = formula.bottle_specification
+ unless bottle.compatible_cellar?
if install_bottle_options[:warn]
opoo <<-EOS.undent
Building #{formula.full_name} from source:
- The bottle needs a #{formula.bottle_specification.cellar} Cellar (yours is #{HOMEBREW_CELLAR}).
+ The bottle needs a #{bottle.cellar} Cellar (yours is #{HOMEBREW_CELLAR}).
EOS
end
return false