diff --git a/pyproject.toml b/pyproject.toml index b84da94..dc96bac 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -29,7 +29,7 @@ dependencies = [ "pyparsing", "scanoss>=1.45.0", "XlsxWriter", - "fosslight_util>=2.2.12", + "fosslight_util>=2.2.14", "PyYAML", "wheel>=0.38.1", "intbitset", diff --git a/src/fosslight_source/cli.py b/src/fosslight_source/cli.py index 4e2712a..3d1d778 100755 --- a/src/fosslight_source/cli.py +++ b/src/fosslight_source/cli.py @@ -176,15 +176,14 @@ def create_report_file( for i, output_extension in enumerate(output_extensions): if output_files[i] is None or output_files[i] == "": if formats: - if formats[i].startswith('spdx') or formats[i].startswith('cyclonedx'): + if formats[i].startswith('spdx'): if platform.system() == 'Windows': logger.warning(f'{formats[i]} is not supported on Windows.Please remove {formats[i]} from format.') to_remove.append(i) else: - if formats[i].startswith('spdx'): - output_files[i] = f"fosslight_spdx_src_{name_time}" - elif formats[i].startswith('cyclonedx'): - output_files[i] = f'fosslight_cyclonedx_src_{name_time}' + output_files[i] = f"fosslight_spdx_src_{name_time}" + elif formats[i].startswith('cyclonedx'): + output_files[i] = f'fosslight_cyclonedx_src_{name_time}' else: if output_extension == _json_ext: output_files[i] = f"fosslight_opossum_src_{name_time}" @@ -276,7 +275,8 @@ def create_report_file( # if need_license and output_extension == _json_ext and "scanoss_reference" in sheet_list: # del sheet_list["scanoss_reference"] result = write_output_file( - combined_path_and_file, output_extension, scan_item, hide_header="", format=output_format + combined_path_and_file, output_extension, scan_item, hide_header="", format=output_format, + scanner_covers=[scan_item.cover] ) results.append(result) for success, msg, result_file in results: