aboutsummaryrefslogtreecommitdiffstats
path: root/Library
diff options
context:
space:
mode:
authorMike McQuaid2013-01-27 19:22:56 +0000
committerMike McQuaid2013-01-29 17:14:11 -0800
commit599b012702127b821826d3e9f5c5f5521b82fd16 (patch)
treec0af9be6171e3e9981cf5b8836f835d16644f67b /Library
parentb58077b3e8c182271ae109cffd125d32c7dd99b6 (diff)
downloadbrew-599b012702127b821826d3e9f5c5f5521b82fd16.tar.bz2
Add pour_bottle? method to Formula.
Allows a formula to selectively disable bottle pouring. e.g. the default Boost bottle does not work with a brewed Python. Fixes Homebrew/homebrew#17142
Diffstat (limited to 'Library')
-rw-r--r--Library/Homebrew/bottles.rb1
-rw-r--r--Library/Homebrew/formula.rb7
2 files changed, 8 insertions, 0 deletions
diff --git a/Library/Homebrew/bottles.rb b/Library/Homebrew/bottles.rb
index 2be2e12d7..88cfc5830 100644
--- a/Library/Homebrew/bottles.rb
+++ b/Library/Homebrew/bottles.rb
@@ -15,6 +15,7 @@ def install_bottle? f
and f.downloader.local_bottle_path
not ARGV.build_from_source? \
and MacOS.bottles_supported? \
+ and f.pour_bottle? \
and f.build.used_options.empty? \
and bottle_current?(f)
end
diff --git a/Library/Homebrew/formula.rb b/Library/Homebrew/formula.rb
index cc16820ef..37f394ce9 100644
--- a/Library/Homebrew/formula.rb
+++ b/Library/Homebrew/formula.rb
@@ -162,6 +162,13 @@ class Formula
@downloader.cached_location
end
+ # Can be overridden to selectively disable bottles from formulae.
+ # Defaults to true so overridden version does not have to check if bottles
+ # are supported.
+ def pour_bottle?
+ true
+ end
+
# tell the user about any caveats regarding this package, return a string
def caveats; nil end