Skip to content

Fix the error to write opossum #75

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 6, 2022
Merged

Fix the error to write opossum #75

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions src/fosslight_util/write_opossum.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,12 +266,17 @@ def make_resources_and_attributions(sheet_items, scanner, resources, fc_list):
resources = make_resources(path, resources)
attribution = Attribution(scanner, license, exclude, copyright, oss_name, oss_version, url)
elif scanner == constant.FL_DEPENDENCY:
if path != '':
try:
packageType = PACKAGE[path]
else:
except Exception:
packageType = ''
if oss_name.split(':')[0] in PACKAGE.items():
packageType = oss_name.split(':')[0]
if path == '':
try_package_type = oss_name.split(':')[0]
else:
try_package_type = path.split(',')[0]
if try_package_type in PACKAGE.items():
packageType = try_package_type

if (os.path.join(os.sep, path) + os.sep) not in fc_list:
fc_list.append(os.path.join(os.sep, path) + os.sep)
ab_list.append(os.path.join(os.sep, path, packageType) + os.sep)
Expand Down