diff --git a/requirements.txt b/requirements.txt index 9fd5d6d..35c1cde 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,7 +8,7 @@ coloredlogs python3-wget beautifulsoup4 jsonmerge -spdx-tools>=0.8.2;sys_platform!="win32" +spdx-tools==0.8.*;sys_platform=="linux" setuptools>=65.5.1 # not directly required, pinned by Snyk to avoid a vulnerability numpy; python_version < '3.8' numpy>=1.22.2; python_version >= '3.8' diff --git a/src/fosslight_util/output_format.py b/src/fosslight_util/output_format.py index b70ef69..21df414 100644 --- a/src/fosslight_util/output_format.py +++ b/src/fosslight_util/output_format.py @@ -183,11 +183,11 @@ def write_output_file(output_file_without_ext: str, file_extension: str, scan_it elif format == 'yaml': success, msg, _ = write_yaml(result_file, scan_item, False) elif format.startswith('spdx'): - if platform.system() != 'Windows': - success, msg, _ = write_spdx(output_file_without_ext, file_extension, scan_item, spdx_version) - else: + if platform.system() == 'Windows' or platform.system() == 'Darwin': success = False - msg = 'Windows not support spdx format.' + msg = f'{platform.system()} not support spdx format.' + else: + success, msg, _ = write_spdx(output_file_without_ext, file_extension, scan_item, spdx_version) else: if file_extension == '.xlsx': success, msg = write_result_to_excel(result_file, scan_item, extended_header, hide_header)