Skip to content

Commit d293bb9

Browse files
authored
Merge pull request #2537 from hanna-modica/bugfix-2523
Fix wrong rule match for MIT license in utils-merge
2 parents 90037b1 + 9861fc9 commit d293bb9

File tree

5 files changed

+53
-0
lines changed

5 files changed

+53
-0
lines changed
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
licenses":
2+
"type": "MIT",
3+
"url": "http://opensource.org/licenses/MIT"
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
license_expression: mit
2+
is_license_tag: yes
3+
relevance: 100
4+
ignorable_urls:
5+
- http://opensource.org/licenses/MIT

src/licensedcode/data/rules/mit_or_gpl-2.0_46.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@ relevance: 100
44
ignorable_urls:
55
- http://opensource.org/licenses/MIT
66
- http://www.gnu.org/licenses/gpl-2.0.html
7+
minimum_coverage: 60
Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
{
2+
"name": "utils-merge",
3+
"version": "1.0.1",
4+
"description": "merge() utility function",
5+
"keywords": [
6+
"util"
7+
],
8+
"author": {
9+
"name": "Jared Hanson",
10+
"email": "[email protected]",
11+
"url": "http://www.jaredhanson.net/"
12+
},
13+
"repository": {
14+
"type": "git",
15+
"url": "git://github.com/jaredhanson/utils-merge.git"
16+
},
17+
"bugs": {
18+
"url": "http://github.com/jaredhanson/utils-merge/issues"
19+
},
20+
"license": "MIT",
21+
"licenses": [
22+
{
23+
"type": "MIT",
24+
"url": "http://opensource.org/licenses/MIT"
25+
}
26+
],
27+
"main": "./index",
28+
"dependencies": {},
29+
"devDependencies": {
30+
"make-node": "0.3.x",
31+
"mocha": "1.x.x",
32+
"chai": "1.x.x"
33+
},
34+
"engines": {
35+
"node": ">= 0.4.0"
36+
},
37+
"scripts": {
38+
"test": "node_modules/.bin/mocha --reporter spec --require test/bootstrap/node test/*.test.js"
39+
}
40+
}
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
license_expressions:
2+
- mit
3+
- mit
4+
notes: Based on https://raw.githubusercontent.com/jaredhanson/utils-merge/v1.0.1/package.json

0 commit comments

Comments
 (0)