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

audit: change location of spdx.json file

Browse Source
This commit is contained in:
lionellloh 2020-06-17 21:45:51 +08:00
parent 03fc6b2c15
commit 3bfca5bcee
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
Library/Homebrew/dev-cmd/spdx.json → Library/Homebrew/data/spdx.json
View File

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

@ -111,8 +111,8 @@ module Homebrew
# Check style in a single batch run up front for performance # Check style in a single batch run up front for performance
style_results = Style.check_style_json(style_files, options) if style_files style_results = Style.check_style_json(style_files, options) if style_files
# load licenses # load licenses
path = File.join(File.dirname(__FILE__), "spdx.json") full_path = File.join(File.dirname(__FILE__), "../data/spdx.json")
spdx_ids = JSON.parse(File.open(File.expand_path(path)).read) spdx_ids = JSON.parse(File.open(full_path).read)
new_formula_problem_lines = [] new_formula_problem_lines = []
audit_formulae.sort.each do |f| audit_formulae.sort.each do |f|
only = only_cops ? ["style"] : args.only only = only_cops ? ["style"] : args.only

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

@ -97,7 +97,7 @@ module Homebrew
describe "#audit_license" do describe "#audit_license" do
let(:spdx_ids) { let(:spdx_ids) {
full_path = File.join(File.expand_path(File.dirname(__FILE__) + "../../../dev-cmd/"), "spdx.json") full_path = File.join(File.expand_path(File.dirname(__FILE__) + "../../../data/"), "spdx.json")
JSON.parse(File.open(full_path).read) JSON.parse(File.open(full_path).read)
} }