Skip to content

Commit e6206ab

Browse files
committed
Update fosslight util version
Signed-off-by: jiyeong.seok <jiyeong.seok@lge.com>
1 parent 4be4add commit e6206ab

File tree

2 files changed

+26
-4
lines changed

2 files changed

+26
-4
lines changed

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ py-tlsh
88
pytz
99
XlsxWriter
1010
PyYAML
11-
fosslight_util>=2.0.1
11+
fosslight_util>=2.0.2
1212
dependency-check

src/fosslight_binary/binary_analysis.py

Lines changed: 25 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
# SPDX-License-Identifier: Apache-2.0
66
import os
77
import sys
8+
import platform
89
from datetime import datetime
910
from binaryornot.check import is_binary
1011
import magic
@@ -93,12 +94,33 @@ def init(path_to_find_bin, output_file_name, formats, path_to_exclude=[]):
9394

9495
while len(output_files) < len(output_extensions):
9596
output_files.append(None)
97+
to_remove = [] # elements of spdx format on windows that should be removed
9698
for i, output_extension in enumerate(output_extensions):
9799
if output_files[i] is None or output_files[i] == "":
98-
if output_extension == _json_ext:
99-
output_files[i] = f"fosslight_opossum_bin_{_start_time}"
100+
if formats:
101+
if formats[i].startswith('spdx'):
102+
if platform.system() != 'Windows':
103+
output_files[i] = f"fosslight_spdx_bin_{_start_time}"
104+
else:
105+
logger.warning('spdx format is not supported on Windows. Please remove spdx from format.')
106+
to_remove.append(i)
107+
else:
108+
if output_extension == _json_ext:
109+
output_files[i] = f"fosslight_opossum_bin_{_start_time}"
110+
else:
111+
output_files[i] = f"fosslight_report_bin_{_start_time}"
100112
else:
101-
output_files[i] = f"fosslight_report_bin_{_start_time}"
113+
if output_extension == _json_ext:
114+
output_files[i] = f"fosslight_opossum_bin_{_start_time}"
115+
else:
116+
output_files[i] = f"fosslight_report_bin_{_start_time}"
117+
for index in sorted(to_remove, reverse=True):
118+
# remove elements of spdx format on windows
119+
del output_files[index]
120+
del output_extensions[index]
121+
del formats[index]
122+
if len(output_extensions) < 1:
123+
sys.exit(0)
102124

103125
combined_paths_and_files = [os.path.join(output_path, file) for file in output_files]
104126
else:

0 commit comments

Comments
 (0)