Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/fosslight_android/_common.py
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ def get_print_array(self, return_excel=True):
need_check = ""
print_items_txt.append(f"{self.bin_name}\t{source_path}\t{self.notice}\t"
f"{oss_name}\t{self.oss_version}\t{self.license}\t{need_check}\t{comment}\t{self.tlsh}\t{self.checksum}")
repo_link = self.download_location if self.is_new_bin else ""
repo_link = self.download_location
print_items_excel.append([self.bin_name, source_path, self.notice, oss_name,
self.oss_version, self.license, repo_link, repo_link, '', '', '', comment,
need_check, self.tlsh, self.checksum])
Expand Down
2 changes: 1 addition & 1 deletion src/fosslight_android/android_binary_analysis.py
Original file line number Diff line number Diff line change
Expand Up @@ -732,7 +732,7 @@ def set_oss_name_by_repository():
source_path = item.source_code_path
item_license = item.license
if (oss_name == CONST_NULL or oss_name == "Android Open Source Project") and source_path != CONST_NULL:
if item_license not in skip_license:
if (not item_license) or (item_license not in skip_license):
item.oss_name, item.oss_version, item.download_location = get_oss_component_name(source_path, oss_name, item.oss_version)
item.homepage = item.download_location
except Exception as error:
Expand Down
Loading