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

correct logic for standard license checking

Browse Source
This commit is contained in:
lionellloh 2020-07-12 12:35:27 +08:00 committed by Lionell
parent b91587d171
commit 557b1d09a2
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -330,7 +330,16 @@ module Homebrew
def audit_license
if formula.license.present?
if formula.license.any? { |lic| @spdx_data["licenses"].any? { |standard_lic| standard_lic["licenseId"] == lic } }
non_standard_licenses = []
formula.license.each do |lic|
next if @spdx_data["licenses"].any? { |standard_lic| standard_lic["licenseId"] == lic }
non_standard_licenses << lic
end
if non_standard_licenses.present?
problem "Formula #{formula.name} contains non standard SPDX license: #{non_standard_licenses} "
end
return unless @online
user, repo = get_repo_data(%r{https?://github\.com/([^/]+)/([^/]+)/?.*}) if @new_formula
@ -341,9 +350,8 @@ module Homebrew
problem "License mismatch - GitHub license is: #{Array(github_license)}, "\
"but Formulae license states: #{formula.license}."
else
problem "#{formula.license} is not a standard SPDX license."
end
elsif @new_formula
problem "No license specified for package."
end