From 2b9561b8370749d036037e7c25e1a3037f108f33 Mon Sep 17 00:00:00 2001 From: Dominyk Tiller Date: Mon, 19 Oct 2015 17:23:06 +0100 Subject: [PATCH] audit: add bottle modifier checks * Checks for placement of the bottle modifier variable. * Checks there isn't a bottle modifier and a bottle do block - The former makes the latter redundant. Closes Homebrew/homebrew#45146. Signed-off-by: Dominyk Tiller --- Library/Homebrew/cmd/audit.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Library/Homebrew/cmd/audit.rb b/Library/Homebrew/cmd/audit.rb index bb8f8811da..ca5891efdb 100644 --- a/Library/Homebrew/cmd/audit.rb +++ b/Library/Homebrew/cmd/audit.rb @@ -172,11 +172,12 @@ class FormulaAuditor [/^ bottle do/, "bottle block"], [/^ devel do/, "devel block"], [/^ head do/, "head block"], + [/^ bottle (:unneeded|:disable)/, "bottle modifier"], [/^ option/, "option"], [/^ depends_on/, "depends_on"], [/^ def install/, "install method"], [/^ def caveats/, "caveats method"], - [/^ test do/, "test block"] + [/^ test do/, "test block"], ] present = component_list.map do |regex, name| @@ -193,6 +194,9 @@ class FormulaAuditor if present.include?("head") && present.include?("head block") problem "Should not have both `head` and `head do`" end + if present.include?("bottle modifier") && present.include?("bottle block") + problem "Should not have `bottle :unneeded/:disable` and `bottle do`" + end end def audit_class