From 14d18a97319348dd2b457c7b279522c19a75c21e Mon Sep 17 00:00:00 2001 From: lionellloh Date: Sun, 12 Jul 2020 12:50:50 +0800 Subject: [PATCH] Forbidden license logic adapt to Array --- Library/Homebrew/formula_installer.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb index 5ac720ebee..30a572c617 100644 --- a/Library/Homebrew/formula_installer.rb +++ b/Library/Homebrew/formula_installer.rb @@ -1123,18 +1123,18 @@ class FormulaInstaller next if @ignore_deps dep_f = dep.to_formula - next unless forbidden_licenses.include? dep_f.license + next unless dep_f.license.all?{ |lic| forbidden_licenses.include? lic } raise CannotInstallFormulaError, <<~EOS - The installation of #{formula.name} has a dependency on #{dep.name} with a forbidden license #{dep_f.license}. + The installation of #{formula.name} has a dependency on #{dep.name} where all its licenses are forbidden: #{dep_f.license}. EOS end return if @only_deps - return unless forbidden_licenses.include? formula.license + return unless formula.license.all? { |lic| forbidden_licenses.include? lic } raise CannotInstallFormulaError, <<~EOS - #{formula.name} has a forbidden license #{formula.license}. + #{formula.name}'s licenses are all forbidden: #{formula.license}. EOS end end