Commit cc993d0 1 parent 802ce9a commit cc993d0 Copy full SHA for cc993d0
File tree 2 files changed +9
-6
lines changed
2 files changed +9
-6
lines changed Original file line number Diff line number Diff line change 1
1
pyparsing
2
2
scanoss <= 1.14.0
3
3
XlsxWriter
4
- fosslight_util >= 2.1.1
4
+ fosslight_util >= 2.1.6
5
5
PyYAML
6
6
wheel >= 0.38.1
7
7
intbitset
Original file line number Diff line number Diff line change @@ -174,12 +174,15 @@ def create_report_file(
174
174
for i , output_extension in enumerate (output_extensions ):
175
175
if output_files [i ] is None or output_files [i ] == "" :
176
176
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.' )
182
180
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 } '
183
186
else :
184
187
if output_extension == _json_ext :
185
188
output_files [i ] = f"fosslight_opossum_src_{ _start_time } "
You can’t perform that action at this time.
0 commit comments