Skip to content

Commit 7559ef7

Browse files
committed
use declared_licenses instead of licenses (detected)
1 parent 9e0ac13 commit 7559ef7

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

f8a_worker/graphutils.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ def extract_component_details(component):
137137
"vulnerabilities": cves
138138
}
139139

140-
licenses = component.get("version", {}).get("licenses", [])
140+
licenses = component.get("version", {}).get("declared_licenses", [])
141141
name = component.get("version", {}).get("pname", [""])[0]
142142
version = component.get("version", {}).get("version", [""])[0]
143143
ecosystem = component.get("version", {}).get("pecosystem", [""])[0]
@@ -213,7 +213,7 @@ def create_package_dict(graph_results, alt_dict=None):
213213
'ecosystem': ecosystem,
214214
'name': name,
215215
'version': version,
216-
'licenses': epv['ver'].get('licenses', []),
216+
'licenses': epv['ver'].get('declared_licenses', []),
217217
'latest_version': select_latest_version(
218218
epv['pkg'].get('libio_latest_version', [''])[0],
219219
epv['pkg'].get('latest_version', [''])[0]),

f8a_worker/workers/recommender.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -673,7 +673,7 @@ def apply_license_filter(user_stack_components, epv_list_alt, epv_list_com):
673673
license_scoring_input = {
674674
'package': epv.get('pkg', {}).get('name', [''])[0],
675675
'version': epv.get('ver', {}).get('version', [''])[0],
676-
'licenses': epv.get('ver', {}).get('licenses', [])
676+
'licenses': epv.get('ver', {}).get('declared_licenses', [])
677677
}
678678
license_score_list_alt.append(license_scoring_input)
679679

@@ -682,7 +682,7 @@ def apply_license_filter(user_stack_components, epv_list_alt, epv_list_com):
682682
license_scoring_input = {
683683
'package': epv.get('pkg', {}).get('name', [''])[0],
684684
'version': epv.get('ver', {}).get('version', [''])[0],
685-
'licenses': epv.get('ver', {}).get('licenses', [])
685+
'licenses': epv.get('ver', {}).get('declared_licenses', [])
686686
}
687687
license_score_list_com.append(license_scoring_input)
688688

f8a_worker/workers/stackaggregator_v2.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ def extract_component_details(component):
7878
}
7979
cves.append(component_cve)
8080

81-
licenses = component.get("version", {}).get("licenses", [])
81+
licenses = component.get("version", {}).get("declared_licenses", [])
8282
name = component.get("version", {}).get("pname", [""])[0]
8383
version = component.get("version", {}).get("version", [""])[0]
8484
ecosystem = component.get("version", {}).get("pecosystem", [""])[0]

0 commit comments

Comments
 (0)