Skip to content

Commit f8a2da9

Browse files
committed
Remove spdx for macos
Signed-off-by: jiyeong.seok <[email protected]>
1 parent 74c86e6 commit f8a2da9

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ coloredlogs
88
python3-wget
99
beautifulsoup4
1010
jsonmerge
11-
spdx-tools>=0.8.2;sys_platform!="win32"
11+
spdx-tools==0.8.*;sys_platform=="linux"
1212
setuptools>=65.5.1 # not directly required, pinned by Snyk to avoid a vulnerability
1313
numpy; python_version < '3.8'
1414
numpy>=1.22.2; python_version >= '3.8'

src/fosslight_util/output_format.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -183,11 +183,11 @@ def write_output_file(output_file_without_ext: str, file_extension: str, scan_it
183183
elif format == 'yaml':
184184
success, msg, _ = write_yaml(result_file, scan_item, False)
185185
elif format.startswith('spdx'):
186-
if platform.system() != 'Windows':
187-
success, msg, _ = write_spdx(output_file_without_ext, file_extension, scan_item, spdx_version)
188-
else:
186+
if platform.system() == 'Windows' or platform.system() == 'Darwin':
189187
success = False
190-
msg = 'Windows not support spdx format.'
188+
msg = f'{platform.system()} not support spdx format.'
189+
else:
190+
success, msg, _ = write_spdx(output_file_without_ext, file_extension, scan_item, spdx_version)
191191
else:
192192
if file_extension == '.xlsx':
193193
success, msg = write_result_to_excel(result_file, scan_item, extended_header, hide_header)

0 commit comments

Comments
 (0)