Skip to content

Commit

Permalink
Merge pull request #22 from fosslight/temp
Browse files Browse the repository at this point in the history
Modify to print output file name
  • Loading branch information
bjk7119 authored Feb 10, 2022
2 parents f246d76 + f5a7543 commit a81ff0d
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 2 deletions.
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ xlrd
openpyxl
progress
pyyaml
fosslight_util>=1.3.8
fosslight_util>=1.3.12
fosslight_dependency>=3.7.4
fosslight_binary>=4.0.7
fosslight_reuse
9 changes: 8 additions & 1 deletion src/fosslight_scanner/fosslight_scanner.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import warnings
import re
import yaml
import sys
from pathlib import Path
from shutil import rmtree as rmdir
from datetime import datetime
Expand Down Expand Up @@ -145,7 +146,12 @@ def run_scanner(src_path, dep_arguments, output_path, keep_raw_data=False,
sheet_list['SRC_FL_Dependency'] = result_list

output_file_without_ext = os.path.join(final_excel_dir, output_file)
success, msg = write_output_file(output_file_without_ext, output_extension, sheet_list)
success, msg, result_file = write_output_file(output_file_without_ext, output_extension, sheet_list)

if success:
logger.info(f"Writing Output file({result_file}, Success: {success}")
else:
logger.error(f"Fail to generate result file. msg:({msg})")

result_log["Result"] = success
if success:
Expand Down Expand Up @@ -229,6 +235,7 @@ def run_main(mode, src_path, dep_arguments, output_file_or_dir, file_format, url
success, msg, output_path, output_file, output_extension = check_output_format(output_file_or_dir, file_format)
if not success:
logger.error(msg)
sys.exit(1)
else:
run_src = False
run_bin = False
Expand Down

0 comments on commit a81ff0d

Please sign in to comment.