aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Homebrew/bottles.rb
diff options
context:
space:
mode:
authorMike McQuaid2013-03-06 12:36:15 +0000
committerMike McQuaid2013-03-09 21:29:53 +0000
commita9a3cf7a19d1c429f21b74bc0ec6ba7b94eddae6 (patch)
tree5151ed08749f20e3c8342d03dea223bcb10f82dd /Library/Homebrew/bottles.rb
parentfebd499cd5192990350410a8162a285fe6a998b8 (diff)
downloadhomebrew-a9a3cf7a19d1c429f21b74bc0ec6ba7b94eddae6.tar.bz2
Warn on bottles skipped due to non-default Cellar.
Closes #18333.
Diffstat (limited to 'Library/Homebrew/bottles.rb')
-rw-r--r--Library/Homebrew/bottles.rb7
1 files changed, 5 insertions, 2 deletions
diff --git a/Library/Homebrew/bottles.rb b/Library/Homebrew/bottles.rb
index 46aedcbd1..32b6f8471 100644
--- a/Library/Homebrew/bottles.rb
+++ b/Library/Homebrew/bottles.rb
@@ -9,7 +9,7 @@ def bottle_filename f, bottle_revision=nil
"#{name}-#{version}#{bottle_native_suffix(bottle_revision)}"
end
-def install_bottle? f
+def install_bottle? f, warn=false
return true if f.downloader and defined? f.downloader.local_bottle_path \
and f.downloader.local_bottle_path
@@ -17,7 +17,10 @@ def install_bottle? f
return false unless f.pour_bottle?
return false unless f.build.used_options.empty?
return false unless bottle_current?(f)
- return false if f.bottle.cellar != :any && f.bottle.cellar != HOMEBREW_CELLAR.to_s
+ if f.bottle.cellar != :any && f.bottle.cellar != HOMEBREW_CELLAR.to_s
+ opoo "Building source; cellar of #{f}'s bottle is #{f.bottle.cellar}" if warn
+ return false
+ end
true
end