admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Apply suggestions from code review

Browse Source 
Code review changes

Co-authored-by: Mike McQuaid <mike@mikemcquaid.com>
This commit is contained in:
Lionell Loh Jian An 2020-07-25 21:39:29 +08:00 committed by Lionell
parent 721c9b06cd
commit 52321b4fcd
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Library/Homebrew/dev-cmd/audit.rb
View File

@ -331,14 +331,14 @@ module Homebrew
def audit_license
if formula.license.present?
non_standard_licenses = []
formula.license.each do |lic|
next if @spdx_data["licenses"].any? { |standard_lic| standard_lic["licenseId"] == lic }
formula.license.each do |license|
next if @spdx_data["licenses"].any? { |spdx| spdx["licenseId"] == license }
non_standard_licenses << lic
non_standard_licenses << license
end
if non_standard_licenses.present?
problem "Formula #{formula.name} contains non standard SPDX license: #{non_standard_licenses}."
problem "Formula #{formula.name} contains non-standard SPDX licenses: #{non_standard_licenses}."
end
return unless @online

2
Library/Homebrew/formula.rb
View File

@ -2215,7 +2215,7 @@ class Formula
if args.nil?
@licenses
else
@licenses = Array(args) unless args == ""
@licenses = Array(args)
end
end

2
Library/Homebrew/formula_installer.rb
View File

@ -1131,7 +1131,7 @@ class FormulaInstaller
end
return if @only_deps
return unless formula.license.all? { |lic| forbidden_licenses.include? lic }
return unless formula.license.all? { |license| forbidden_licenses.include? license }
raise CannotInstallFormulaError, <<~EOS
#{formula.name}'s licenses are all forbidden: #{formula.license}.