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

formula_installer: unfreeze forbidden licenses string

Browse Source
This commit is contained in:
Rylan Polster 2020-10-22 11:22:06 -04:00
parent e459056d27
commit b06bcf3db1
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Library/Homebrew/formula_installer.rb
View File

@ -1139,10 +1139,10 @@ class FormulaInstaller
end end
def forbidden_license_check def forbidden_license_check
forbidden_licenses = Homebrew::EnvConfig.forbidden_licenses.to_s forbidden_licenses = Homebrew::EnvConfig.forbidden_licenses.dup
SPDX::ALLOWED_LICENSE_SYMBOLS.each do |s| SPDX::ALLOWED_LICENSE_SYMBOLS.each do |s|
pattern = /#{s.to_s.tr("_", " ")}/i pattern = /#{s.to_s.tr("_", " ")}/i
forbidden_licenses = forbidden_licenses.sub(pattern, s.to_s) forbidden_licenses.sub!(pattern, s.to_s)
end end
forbidden_licenses = forbidden_licenses.split(" ").to_h do |license| forbidden_licenses = forbidden_licenses.split(" ").to_h do |license|
[license, SPDX.license_version_info(license)] [license, SPDX.license_version_info(license)]