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

Merge pull request #7874 from chenrui333/disable-license-check-for-new-formulae

Browse Source 
disable license check for new formulae
This commit is contained in:
Bo Anderson 2020-07-01 23:18:10 +01:00 committed by GitHub
commit 05a7a2ccc8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -333,23 +333,21 @@ module Homebrew
].freeze ].freeze
def audit_license def audit_license
if formula.license.present? return if formula.license.blank?
if @spdx_data["licenses"].any? { |lic| lic["licenseId"] == formula.license }
return unless @online
user, repo = get_repo_data(%r{https?://github\.com/([^/]+)/([^/]+)/?.*}) if @new_formula if @spdx_data["licenses"].any? { |lic| lic["licenseId"] == formula.license }
return if user.blank? return unless @online
github_license = GitHub.get_repo_license(user, repo) user, repo = get_repo_data(%r{https?://github\.com/([^/]+)/([^/]+)/?.*}) if @new_formula
return if github_license && (github_license == formula.license) return if user.blank?
problem "License mismatch - GitHub license is: #{github_license}, "\ github_license = GitHub.get_repo_license(user, repo)
"but Formulae license states: #{formula.license}." return if github_license && (github_license == formula.license)
else
problem "#{formula.license} is not a standard SPDX license." problem "License mismatch - GitHub license is: #{github_license}, "\
end "but Formulae license states: #{formula.license}."
elsif @new_formula else
problem "No license specified for package." problem "#{formula.license} is not a standard SPDX license."
end end
end end

12
Library/Homebrew/test/dev-cmd/audit_spec.rb
View File

@ -99,18 +99,6 @@ module Homebrew
expect(fa.problems).to be_empty expect(fa.problems).to be_empty
end end
it "detects no license info" do
fa = formula_auditor "foo", <<~RUBY, spdx_data: spdx_data, new_formula: true
class Foo < Formula
url "https://brew.sh/foo-1.0.tgz"
license ""
end
RUBY
fa.audit_license
expect(fa.problems.first).to match "No license specified for package."
end
it "detects if license is not a standard spdx-id" do it "detects if license is not a standard spdx-id" do
fa = formula_auditor "foo", <<~RUBY, spdx_data: spdx_data, new_formula: true fa = formula_auditor "foo", <<~RUBY, spdx_data: spdx_data, new_formula: true
class Foo < Formula class Foo < Formula