From 2c5f56d77db55a95b7f8bac76cd2eedc130f5e27 Mon Sep 17 00:00:00 2001 From: commitay Date: Wed, 4 Jul 2018 13:19:16 +1000 Subject: [PATCH] audit: ensure `bottle` is defined --- Library/Homebrew/dev-cmd/audit.rb | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/Library/Homebrew/dev-cmd/audit.rb b/Library/Homebrew/dev-cmd/audit.rb index 73788068f2..0bc896841c 100644 --- a/Library/Homebrew/dev-cmd/audit.rb +++ b/Library/Homebrew/dev-cmd/audit.rb @@ -488,10 +488,29 @@ module Homebrew end end - def audit_bottle_spec + def audit_bottle_disabled return unless formula.bottle_disabled? - return if formula.bottle_disable_reason.valid? - problem "Unrecognized bottle modifier" + return if formula.bottle_unneeded? + + if !formula.bottle_disable_reason.valid? + problem "Unrecognized bottle modifier" + else + bottle_disabled_whitelist = %w[ + cryptopp + leafnode + ] + return if bottle_disabled_whitelist.include?(formula.name) + problem "Formulae should not use `bottle :disabled`" if @official_tap + end + end + + def audit_bottle_spec + return unless @official_tap + return if @new_formula + return unless @online + return if formula.bottle_defined? || formula.bottle_disabled? + return if formula.name == "testbottest" + problem "`bottle` is not defined" end def audit_github_repository