Skip to content

Commit 5bda8ac

Browse files
authored
Fix the pub result parsing bug (#237)
Signed-off-by: jiyeong.seok <[email protected]>
1 parent 07afb64 commit 5bda8ac

File tree

1 file changed

+13
-9
lines changed
  • src/fosslight_dependency/package_manager

1 file changed

+13
-9
lines changed

src/fosslight_dependency/package_manager/Pub.py

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,8 @@ def parse_oss_information(self, f_name):
121121
continue
122122
oss_item.name = f"{self.package_manager_name}:{oss_origin_name}"
123123
oss_item.version = json_data['version']
124+
if oss_item.version is None:
125+
oss_item.version = ''
124126
oss_item.homepage = json_data['homepage']
125127
if oss_item.homepage is None:
126128
oss_item.homepage = json_data['repository']
@@ -130,17 +132,19 @@ def parse_oss_information(self, f_name):
130132
dep_item.purl = get_url_to_purl(oss_item.download_location, self.package_manager_name)
131133
purl_dict[f'{oss_origin_name}({oss_item.version})'] = dep_item.purl
132134
license_txt = json_data['license']
135+
if license_txt is not None:
136+
tmp_license_txt = open(tmp_license_txt_file_name, 'w', encoding='utf-8')
137+
tmp_license_txt.write(license_txt)
138+
tmp_license_txt.close()
133139

134-
tmp_license_txt = open(tmp_license_txt_file_name, 'w', encoding='utf-8')
135-
tmp_license_txt.write(license_txt)
136-
tmp_license_txt.close()
140+
license_name_with_license_scanner = check_and_run_license_scanner(self.platform,
141+
self.license_scanner_bin,
142+
tmp_license_txt_file_name)
137143

138-
license_name_with_license_scanner = check_and_run_license_scanner(self.platform,
139-
self.license_scanner_bin,
140-
tmp_license_txt_file_name)
141-
142-
if license_name_with_license_scanner != "":
143-
oss_item.license = license_name_with_license_scanner
144+
if license_name_with_license_scanner != "":
145+
oss_item.license = license_name_with_license_scanner
146+
else:
147+
oss_item.license = ''
144148

145149
if self.direct_dep:
146150
if oss_origin_name not in self.total_dep_list:

0 commit comments

Comments
 (0)