From d9242c540d82ec25019896a043410dd07b831609 Mon Sep 17 00:00:00 2001 From: Max Nordlund Date: Fri, 14 Oct 2016 23:05:34 +0200 Subject: [PATCH 1/2] Fix wrong ordering on when clauses in audit.rb It looks like a rebase/merge conflict remmenet. --- Library/Homebrew/dev-cmd/audit.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Library/Homebrew/dev-cmd/audit.rb b/Library/Homebrew/dev-cmd/audit.rb index bfe56302ef..d5ab9ca8f1 100644 --- a/Library/Homebrew/dev-cmd/audit.rb +++ b/Library/Homebrew/dev-cmd/audit.rb @@ -406,10 +406,9 @@ class FormulaAuditor depends_on :ruby => "1.8" where "1.8" is the minimum version of Ruby required. EOS - when "open-mpi", "mpich" - problem <<-EOS.undent when *BUILD_TIME_DEPS next if dep.build? || dep.run? + when "open-mpi", "mpich" problem <<-EOS.undent There are multiple conflicting ways to install MPI. Use an MPIRequirement: depends_on :mpi => [] From c7fde5ddc98b1c605d55be87a68648640a842281 Mon Sep 17 00:00:00 2001 From: Max Nordlund Date: Sat, 15 Oct 2016 18:31:06 +0200 Subject: [PATCH 2/2] Fix when clause ordering. --- Library/Homebrew/dev-cmd/audit.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Library/Homebrew/dev-cmd/audit.rb b/Library/Homebrew/dev-cmd/audit.rb index d5ab9ca8f1..c2a8fb450d 100644 --- a/Library/Homebrew/dev-cmd/audit.rb +++ b/Library/Homebrew/dev-cmd/audit.rb @@ -406,8 +406,6 @@ class FormulaAuditor depends_on :ruby => "1.8" where "1.8" is the minimum version of Ruby required. EOS - when *BUILD_TIME_DEPS - next if dep.build? || dep.run? when "open-mpi", "mpich" problem <<-EOS.undent There are multiple conflicting ways to install MPI. Use an MPIRequirement: @@ -415,6 +413,8 @@ class FormulaAuditor Where is a comma delimited list that can include: :cc, :cxx, :f77, :f90 EOS + when *BUILD_TIME_DEPS + next if dep.build? || dep.run? end end end