Skip to content

Commit 87f031c

Browse files
authored
Merge pull request #57 from fosslight/develop
Apply additional return val of 'parsing_yml'
2 parents 57b3389 + 0867afe commit 87f031c

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ openpyxl
66
progress
77
pyyaml
88
beautifulsoup4
9-
fosslight_util>=1.4.1
9+
fosslight_util>=1.4.16
1010
fosslight_dependency>=3.7.4
1111
fosslight_binary>=4.0.7
1212
fosslight_prechecker>=3.0.1

src/fosslight_scanner/common.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ def merge_yamls(_output_dir, merge_yaml_files, final_report, remove_src_data=Fal
168168
try:
169169
for mf in merge_yaml_files:
170170
if os.path.exists(os.path.join(_output_dir, mf)):
171-
oss_list, license_list = parsing_yml(os.path.join(_output_dir, mf), _output_dir)
171+
oss_list, license_list, err_reason = parsing_yml(os.path.join(_output_dir, mf), _output_dir)
172172

173173
if remove_src_data:
174174
existed_yaml = {}

0 commit comments

Comments
 (0)