@@ -118,9 +118,9 @@ def parse_oss_information(self, f_name):
118
118
comment = 'root package'
119
119
120
120
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 )
122
122
123
- if license_comment != '' :
123
+ if multi_flag :
124
124
comment = f'{ comment } , { license_comment } '
125
125
sheet_list .append ([const .SUPPORT_PACKAE .get (self .package_manager_name ),
126
126
oss_name , oss_version , multi_license , dn_loc , homepage , '' , '' , comment ])
@@ -160,22 +160,25 @@ def check_multi_license(license_name, manifest_file_path):
160
160
multi_license_list = []
161
161
multi_license = ''
162
162
license_comment = ''
163
+ multi_flag = False
163
164
try :
164
165
if isinstance (license_name , list ):
165
166
for i in range (0 , len (license_name )):
166
167
l_i = license_name [i ].replace ("," , "" )
167
168
multi_license_list .append (check_unknown_license (l_i , manifest_file_path ))
168
169
multi_license = ',' .join (multi_license_list )
170
+ multi_flag = True
169
171
else :
170
172
if license_name .startswith ('(' ) and license_name .endswith (')' ):
171
173
license_name = license_name .lstrip ('(' ).rstrip (')' )
172
174
license_comment = license_name
173
175
multi_license = ',' .join (re .split (r'OR|AND' , license_name ))
176
+ multi_flag = True
174
177
except Exception as e :
175
178
multi_license = license_name
176
179
logger .warning (f'Fail to parse multi license in npm: { e } ' )
177
180
178
- return multi_license , license_comment
181
+ return multi_license , license_comment , multi_flag
179
182
180
183
181
184
def check_unknown_license (license_name , manifest_file_path ):
0 commit comments