Skip to content

Commit dbfa1dd

Browse files
committed
Fix the write function parameter
Signed-off-by: Jiyeong Seok <[email protected]>
1 parent af85502 commit dbfa1dd

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

src/fosslight_source/convert_scancode.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
import yaml
1515
from ._parsing_scancode_file_item import parsing_file_item, get_error_from_header
1616
from fosslight_util.output_format import check_output_format, write_output_file
17-
from fosslight_util.write_opossum import FL_SOURCE
1817
from ._help import print_help_msg_convert
1918
from ._license_matched import get_license_list_to_print
2019

@@ -26,7 +25,7 @@ def convert_json_to_output_report(scancode_json, output_file_name, need_license=
2625
global logger
2726

2827
sheet_license_prefix = "matched_text"
29-
sheet_SRC_prefix = "SRC"
28+
sheet_SRC_prefix = "SRC_FL_Source"
3029
file_list = []
3130
lic_list = {}
3231
msg = ""
@@ -87,7 +86,7 @@ def convert_json_to_output_report(scancode_json, output_file_name, need_license=
8786
logger.warning("Error parsing "+file+":" + str(ex))
8887

8988
output_file_without_ext = os.path.join(output_path, output_file)
90-
success_to_write, writing_msg = write_output_file(output_file_without_ext, output_extension, sheet_list, FL_SOURCE)
89+
success_to_write, writing_msg = write_output_file(output_file_without_ext, output_extension, sheet_list)
9190
logger.info("Writing Output file(" + output_file + output_extension + "):" + str(success_to_write) + " " + writing_msg)
9291
if success_to_write:
9392
result_log["Output file"] = output_file_without_ext + output_extension

src/fosslight_source/run_scancode.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
from ._parsing_scancode_file_item import get_error_from_header
2121
from ._help import print_help_msg_source
2222
from ._license_matched import get_license_list_to_print
23-
from fosslight_util.write_opossum import FL_SOURCE
2423
from fosslight_util.output_format import check_output_format, write_output_file
2524

2625
logger = logging.getLogger(constant.LOGGER_NAME)
@@ -133,13 +132,13 @@ def run_scan(path_to_scan, output_file_name="",
133132
success = True
134133
result_list = sorted(
135134
result_list, key=lambda row: (''.join(row.licenses)))
136-
sheet_list["SRC"] = [scan_item.get_row_to_print() for scan_item in result_list]
135+
sheet_list["SRC_FL_Source"] = [scan_item.get_row_to_print() for scan_item in result_list]
137136
if need_license:
138137
sheet_list["matched_text"] = get_license_list_to_print(license_list)
139138

140139
output_file_without_ext = os.path.join(output_path, output_file)
141140
success_to_write, writing_msg = write_output_file(output_file_without_ext, output_extension,
142-
sheet_list, FL_SOURCE)
141+
sheet_list)
143142
logger.info("Writing Output file(" + output_file + output_extension + "):" + str(success_to_write)
144143
+ " " + writing_msg)
145144
if success_to_write:

0 commit comments

Comments
 (0)