Skip to content

Commit cc993d0

Browse files
committed
Support cycloneDX format
Signed-off-by: jiyeong.seok <jiyeong.seok@lge.com>
1 parent 802ce9a commit cc993d0

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
pyparsing
22
scanoss<=1.14.0
33
XlsxWriter
4-
fosslight_util>=2.1.1
4+
fosslight_util>=2.1.6
55
PyYAML
66
wheel>=0.38.1
77
intbitset

src/fosslight_source/cli.py

+8-5
Original file line numberDiff line numberDiff line change
@@ -174,12 +174,15 @@ def create_report_file(
174174
for i, output_extension in enumerate(output_extensions):
175175
if output_files[i] is None or output_files[i] == "":
176176
if formats:
177-
if formats[i].startswith('spdx'):
178-
if platform.system() != 'Windows':
179-
output_files[i] = f"fosslight_spdx_src_{_start_time}"
180-
else:
181-
logger.warning('spdx format is not supported on Windows. Please remove spdx from format.')
177+
if formats[i].startswith('spdx') or formats[i].startswith('cyclonedx'):
178+
if platform.system() == 'Windows':
179+
logger.warning(f'{formats[i]} is not supported on Windows.Please remove {formats[i]} from format.')
182180
to_remove.append(i)
181+
else:
182+
if formats[i].stasrtswith('spdx'):
183+
output_files[i] = f"fosslight_spdx_src_{_start_time}"
184+
elif formats[i].startswith('cyclonedx'):
185+
output_files[i] = f'fosslight_cyclonedx_src_{_start_time}'
183186
else:
184187
if output_extension == _json_ext:
185188
output_files[i] = f"fosslight_opossum_src_{_start_time}"

0 commit comments

Comments
 (0)