From d20d08b5fe5eda386981e2da07c1000d6fb4431d Mon Sep 17 00:00:00 2001 From: Xu Cheng Date: Mon, 14 Sep 2015 20:06:27 +0800 Subject: [PATCH] bottle: fail if bottle is disabled --- Library/Homebrew/cmd/bottle.rb | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/Library/Homebrew/cmd/bottle.rb b/Library/Homebrew/cmd/bottle.rb index fb9d52ffe7..4aef73ebac 100644 --- a/Library/Homebrew/cmd/bottle.rb +++ b/Library/Homebrew/cmd/bottle.rb @@ -145,6 +145,12 @@ module Homebrew return ofail "Formula not installed or up-to-date: #{f.full_name}" end + if f.bottle_disabled? + ofail "Formula has disabled bottle: #{f.full_name}" + puts f.bottle_disable_reason + return + end + unless built_as_bottle? f return ofail "Formula not installed with '--build-bottle': #{f.full_name}" end @@ -288,6 +294,12 @@ module Homebrew ohai formula_name f = Formulary.factory(formula_name) + if f.bottle_disabled? + ofail "Formula #{f.full_name} has disabled bottle" + puts f.bottle_disable_reason + next + end + bottle = if keep_old f.bottle_specification.dup else