Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ $ scarfer example-data/cairo-1.16.0-scan.json -ef "/.*pdi.*\.c$"

* [Scancode](https://github.com/nexB/scancode-toolkit) Toolkit, version 21 and upwards

* [Scancode](https://github.com/nexB/scancode-toolkit) Output Format version 1.0.0, 2.0.0, 3.0.*, 3.2.*
* [Scancode](https://github.com/nexB/scancode-toolkit) Output Format version 1.0.0, 2.0.0, 3.0, 3.2, 4.0

# Hints on source code scanners

Expand Down
3 changes: 2 additions & 1 deletion scarfer/scan_interface.py
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,8 @@ def read(self):
_file['license'] = {}
matches = []
for le in f[self.licenses_value]:
if self.scancode_format == "3.0.0":
vers = self.scancode_format[:3]
if vers == "3.0" or vers == "3.2" or vers == "4.0":
for match in le['matches']:
matches.append({
"key": match['license_expression'],
Expand Down
Loading