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

brew style --fix

Browse Source
This commit is contained in:
lionellloh 2020-07-12 13:21:42 +08:00 committed by Lionell
parent 797a07d555
commit 3982810eab
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -333,6 +333,7 @@ module Homebrew
non_standard_licenses = [] non_standard_licenses = []
formula.license.each do |lic| formula.license.each do |lic|
next if @spdx_data["licenses"].any? { |standard_lic| standard_lic["licenseId"] == lic } next if @spdx_data["licenses"].any? { |standard_lic| standard_lic["licenseId"] == lic }
non_standard_licenses << lic non_standard_licenses << lic
end end
@ -340,17 +341,16 @@ module Homebrew
problem "Formula #{formula.name} contains non standard SPDX license: #{non_standard_licenses}." problem "Formula #{formula.name} contains non standard SPDX license: #{non_standard_licenses}."
end end
return unless @online return unless @online
user, repo = get_repo_data(%r{https?://github\.com/([^/]+)/([^/]+)/?.*}) if @new_formula user, repo = get_repo_data(%r{https?://github\.com/([^/]+)/([^/]+)/?.*}) if @new_formula
return if user.blank? return if user.blank?
github_license = GitHub.get_repo_license(user, repo) github_license = GitHub.get_repo_license(user, repo)
return if github_license && (formula.license + ["NOASSERTION"]).include?(github_license) return if github_license && (formula.license + ["NOASSERTION"]).include?(github_license)
problem "License mismatch - GitHub license is: #{Array(github_license)}, "\
"but Formulae license states: #{formula.license}."
problem "License mismatch - GitHub license is: #{Array(github_license)}, "\
"but Formulae license states: #{formula.license}."
elsif @new_formula elsif @new_formula
problem "No license specified for package." problem "No license specified for package."

4
Library/Homebrew/formula.rb
View File

@ -2214,11 +2214,11 @@ class Formula
# <pre>license "BSD-2-Clause"</pre> # <pre>license "BSD-2-Clause"</pre>
def license(args = nil) def license(args = nil)
if args.nil? if args.nil?
return @licenses @licenses
else else
@licenses = Array(args) unless args == "" @licenses = Array(args) unless args == ""
puts @licenses puts @licenses
# license. # license.
end end
end end

2
Library/Homebrew/formula_installer.rb
View File

@ -1123,7 +1123,7 @@ class FormulaInstaller
next if @ignore_deps next if @ignore_deps
dep_f = dep.to_formula dep_f = dep.to_formula
next unless dep_f.license.all?{ |lic| forbidden_licenses.include? lic } next unless dep_f.license.all? { |lic| forbidden_licenses.include? lic }
raise CannotInstallFormulaError, <<~EOS raise CannotInstallFormulaError, <<~EOS
The installation of #{formula.name} has a dependency on #{dep.name} where all its licenses are forbidden: #{dep_f.license}. The installation of #{formula.name} has a dependency on #{dep.name} where all its licenses are forbidden: #{dep_f.license}.