Skip to content

Commit f545353

Browse files
committed
Fixed #518 - add scancode option for gen
* and updated changelog Signed-off-by: Chin Yeung Li <[email protected]>
1 parent ee02163 commit f545353

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

CHANGELOG.rst

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,13 @@
22
Changelog
33

44
xxxx-xx-xx
5-
Release x.x.x
5+
Release 10.0.0
66

77
* Fixd error in load_json in util.py
8+
* Code cleanup
9+
* Work with the SCTK version 32 and later (Drop support for SCTK version 31 and earlier)
10+
* Implement `--scancode` option for `gen`
11+
812

913
2023-07-14
1014
Release 9.0.0

src/attributecode/model.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1487,8 +1487,8 @@ def collect_inventory_license_expression(location, scancode=False, worksheet=Non
14871487

14881488
if scancode:
14891489
inventory = gen.load_scancode_json(location)
1490-
# ScanCode is using 'license_expressions' whereas we are using 'license_expression'
1491-
if not 'license_expressions' in inventory[0]:
1490+
# ScanCode uses 'detected_license_expression'
1491+
if not 'detected_license_expression' in inventory[0]:
14921492
errors.append(
14931493
Error(CRITICAL, "No 'license_expressions' field in the input."))
14941494
return errors, abouts

0 commit comments

Comments
 (0)