Skip to content

Commit

Permalink
Merge pull request #197 from fosslight/req_bug
Browse files Browse the repository at this point in the history
Remove spdx for macos
  • Loading branch information
soimkim authored Oct 15, 2024
2 parents 74c86e6 + f8a2da9 commit fc769a6
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
8 changes: 4 additions & 4 deletions src/fosslight_util/output_format.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit fc769a6

Please sign in to comment.