From 32ab18c189fadace3413985f1ea5cae850afe139 Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Mon, 10 Mar 2014 14:56:02 -0500 Subject: [PATCH] Wrap cellar compatibility check in a method --- Library/Homebrew/bottles.rb | 2 +- Library/Homebrew/software_spec.rb | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Library/Homebrew/bottles.rb b/Library/Homebrew/bottles.rb index 80778b2b52..0c247e5d83 100644 --- a/Library/Homebrew/bottles.rb +++ b/Library/Homebrew/bottles.rb @@ -14,7 +14,7 @@ def install_bottle? f, options={:warn=>false} return false unless f.pour_bottle? return false unless f.bottle - if f.bottle.cellar != :any && f.bottle.cellar != HOMEBREW_CELLAR.to_s + unless f.bottle.compatible_cellar? if options[:warn] opoo "Building source; cellar of #{f}'s bottle is #{f.bottle.cellar}" end diff --git a/Library/Homebrew/software_spec.rb b/Library/Homebrew/software_spec.rb index 9574dd2d35..4706e5ab49 100644 --- a/Library/Homebrew/software_spec.rb +++ b/Library/Homebrew/software_spec.rb @@ -121,6 +121,10 @@ class Bottle @cellar = spec.cellar @revision = spec.revision end + + def compatible_cellar? + cellar == :any || cellar == HOMEBREW_CELLAR.to_s + end end class BottleSpecification