Skip to content

Commit bce6552

Browse files
authored
Fix duplicated output file if multi package manage (#105)
Signed-off-by: Jiyeong Seok <[email protected]>
1 parent 766ec21 commit bce6552

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

src/fosslight_dependency/run_dependency_scanner.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -149,17 +149,17 @@ def run_dependency_scanner(package_manager='', input_dir='', output_dir_file='',
149149
if const.ANDROID in found_package_manager.keys():
150150
found_package_manager[const.ANDROID] = pass_key
151151

152-
output_file_without_ext = os.path.join(output_path, output_file)
153-
success_to_write, writing_msg, result_file = write_output_file(output_file_without_ext, output_extension,
154-
sheet_list)
155-
if success_to_write:
156-
if result_file:
157-
logger.info(f"Writing Output file({result_file}), success:{success_to_write}")
158-
else:
159-
logger.warning(f"{writing_msg}")
152+
output_file_without_ext = os.path.join(output_path, output_file)
153+
success_to_write, writing_msg, result_file = write_output_file(output_file_without_ext, output_extension,
154+
sheet_list)
155+
if success_to_write:
156+
if result_file:
157+
logger.info(f"Writing Output file({result_file}), success:{success_to_write}")
160158
else:
161-
ret = False
162-
logger.error(f"Fail to generate result file. msg:({writing_msg})")
159+
logger.warning(f"{writing_msg}")
160+
else:
161+
ret = False
162+
logger.error(f"Fail to generate result file. msg:({writing_msg})")
163163

164164
logger.warning("### FINISH ###")
165165
return ret, sheet_list

0 commit comments

Comments
 (0)