From 0eb9b62c2da3f58af15dc525efabd69eccf1114e Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Mon, 28 Jun 2021 12:54:12 +0100 Subject: [PATCH] formula_auditor: don't allow `bottle :unneeded` in core. Now we have `all:` bottles and Bintray is going away for `mirror`s: let's bottle everything in Homebrew/homebrew-core. --- Library/Homebrew/formula_auditor.rb | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/Library/Homebrew/formula_auditor.rb b/Library/Homebrew/formula_auditor.rb index 535c61cd81..5076448ba0 100644 --- a/Library/Homebrew/formula_auditor.rb +++ b/Library/Homebrew/formula_auditor.rb @@ -438,13 +438,16 @@ module Homebrew def audit_bottle_disabled return unless formula.bottle_disabled? - return if formula.bottle_unneeded? - problem "Unrecognized bottle modifier" unless formula.bottle_disable_reason.valid? - - return unless @core_tap - - problem "Formulae in homebrew/core should not use `bottle :disabled`" + if !formula.bottle_disable_reason.valid? + problem "Unrecognized bottle modifier" + elsif @core_tap + if formula.bottle_unneeded? + problem "Formulae in homebrew/core should not use `bottle :unneeded`" + else + problem "Formulae in homebrew/core should not use `bottle :disabled`" + end + end end def audit_github_repository_archived