Skip to content

Commit 283441f

Browse files
authored
Fix the npm multi license issue (#122)
Signed-off-by: Jiyeong Seok <[email protected]>
1 parent 42047ca commit 283441f

File tree

1 file changed

+6
-3
lines changed
  • src/fosslight_dependency/package_manager

1 file changed

+6
-3
lines changed

src/fosslight_dependency/package_manager/Npm.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -118,9 +118,9 @@ def parse_oss_information(self, f_name):
118118
comment = 'root package'
119119

120120
manifest_file_path = os.path.join(package_path, const.SUPPORT_PACKAE.get(self.package_manager_name))
121-
multi_license, license_comment = check_multi_license(license_name, manifest_file_path)
121+
multi_license, license_comment, multi_flag = check_multi_license(license_name, manifest_file_path)
122122

123-
if license_comment != '':
123+
if multi_flag:
124124
comment = f'{comment}, {license_comment}'
125125
sheet_list.append([const.SUPPORT_PACKAE.get(self.package_manager_name),
126126
oss_name, oss_version, multi_license, dn_loc, homepage, '', '', comment])
@@ -160,22 +160,25 @@ def check_multi_license(license_name, manifest_file_path):
160160
multi_license_list = []
161161
multi_license = ''
162162
license_comment = ''
163+
multi_flag = False
163164
try:
164165
if isinstance(license_name, list):
165166
for i in range(0, len(license_name)):
166167
l_i = license_name[i].replace(",", "")
167168
multi_license_list.append(check_unknown_license(l_i, manifest_file_path))
168169
multi_license = ','.join(multi_license_list)
170+
multi_flag = True
169171
else:
170172
if license_name.startswith('(') and license_name.endswith(')'):
171173
license_name = license_name.lstrip('(').rstrip(')')
172174
license_comment = license_name
173175
multi_license = ','.join(re.split(r'OR|AND', license_name))
176+
multi_flag = True
174177
except Exception as e:
175178
multi_license = license_name
176179
logger.warning(f'Fail to parse multi license in npm: {e}')
177180

178-
return multi_license, license_comment
181+
return multi_license, license_comment, multi_flag
179182

180183

181184
def check_unknown_license(license_name, manifest_file_path):

0 commit comments

Comments
 (0)