From c7c33c98309790075e346f532ff7a49d007542e4 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Wed, 6 Mar 2013 12:36:15 +0000 Subject: [PATCH] Warn on bottles skipped due to non-default Cellar. Closes Homebrew/homebrew#18333. --- Library/Homebrew/bottles.rb | 7 +++++-- Library/Homebrew/formula_installer.rb | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Library/Homebrew/bottles.rb b/Library/Homebrew/bottles.rb index 46aedcbd14..32b6f84717 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 diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb index 8cd47e6d25..0a1eba69e1 100644 --- a/Library/Homebrew/formula_installer.rb +++ b/Library/Homebrew/formula_installer.rb @@ -25,7 +25,7 @@ class FormulaInstaller end def pour_bottle? - install_bottle?(f) && (tab.used_options.empty? rescue true) && options.empty? + (tab.used_options.empty? rescue true) && options.empty? && install_bottle?(f, true) end def check_install_sanity