fosslight-scanner 2.1.5__py3-none-any.whl → 2.1.7__py3-none-any.whl

fosslight_scanner/common.py

@@ -8,6 +8,7 @@ import sys
 import logging
 import shutil
 import copy
+import traceback
 from fosslight_util.constant import LOGGER_NAME, FOSSLIGHT_SOURCE, FOSSLIGHT_BINARY, FOSSLIGHT_DEPENDENCY
 from fosslight_util.write_scancodejson import write_scancodejson
 from fosslight_util.oss_item import OssItem, FileItem
@@ -177,7 +178,10 @@ def correct_scanner_result(all_scan_item):
                         bin_empty_license_exists = all(not oss_item.license for oss_item in bin_fileitem.oss_items)
 
                         if src_all_licenses_non_empty and bin_empty_license_exists:
-                            exclude = bin_fileitem.oss_items[0].exclude
+                            if bin_fileitem.oss_items:
+                                exclude = bin_fileitem.oss_items[0].exclude
+                            else:
+                                exclude = False
                             bin_fileitem.oss_items = []
                             for src_oss_item in src_fileitem.oss_items:
                                 src_oss_item.exclude = exclude
@@ -190,13 +194,11 @@ def correct_scanner_result(all_scan_item):
                 for i in sorted(remove_src_idx_list, reverse=True):
                     del src_fileitems[i]
         except Exception as ex:
-            logger.warning(f"correct the scanner result:{ex}")
+            logger.warning(f"Fail to correct the scanner result:{ex}")
+            logger.warning(traceback.format_exc())
 
-    try:
-        if duplicates:
-            logger.info('Success to correct the src/bin scanner result')
-    except Exception as ex:
-        logger.warning(f"Corrected src/bin scanner result:{ex}")
+    if duplicates:
+        logger.info('Success to correct the src/bin scanner result')
     return all_scan_item
 
 

fosslight_scanner/fosslight_scanner.py

@@ -43,6 +43,7 @@ except ModuleNotFoundError:
     fosslight_source_installed = False
 
 OUTPUT_REPORT_PREFIX = "fosslight_report_all_"
+COMPARE_OUTPUT_REPORT_PREFIX = "fosslight_compare_"
 PKG_NAME = "fosslight_scanner"
 logger = logging.getLogger(constant.LOGGER_NAME)
 warnings.simplefilter(action='ignore', category=FutureWarning)
@@ -426,7 +427,8 @@ def run_main(mode_list, path_arg, dep_arguments, output_file_or_dir, file_format
                 logger.error("(compare mode) Cannot find after FOSSLight report file (2nd param with -y option).")
                 return False
             ret, final_excel_dir, result_log = init(output_path)
-
+            if not output_files:
+                output_files = [COMPARE_OUTPUT_REPORT_PREFIX + _start_time]
             run_compare(os.path.join(_executed_path, before_comp_f), os.path.join(_executed_path, after_comp_f),
                         final_excel_dir, output_files, output_extensions, _start_time, _output_dir)
         else:

{fosslight_scanner-2.1.5.dist-info → fosslight_scanner-2.1.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fosslight-scanner
-Version: 2.1.5
+Version: 2.1.7
 Summary: FOSSLight Scanner
 Home-page: https://github.com/fosslight/fosslight_scanner
 Author: LG Electronics

{fosslight_scanner-2.1.5.dist-info → fosslight_scanner-2.1.7.dist-info}/RECORD

@@ -4,12 +4,12 @@ fosslight_scanner/_help.py,sha256=-Dqgn1inH26614GjrIe8I5cdEziuAxTtwrUdtTkrpjQ,30
 fosslight_scanner/_parse_setting.py,sha256=SoIEoPGlFXAp6__eEFEMIPYPoKLvmqxXF5X_C_uFiVI,2468
 fosslight_scanner/_run_compare.py,sha256=zmzX-FIvWCSkwPvEA3iHfVpyg6QDGUCpw3tJuGLdPWM,10657
 fosslight_scanner/cli.py,sha256=C4YNPVJJ-Ezj_6xe8k9QbIrf5V44GXbHWCGzR2FMcV8,6547
-fosslight_scanner/common.py,sha256=K7lCp1ysKzmdHIBQZzLCIGiOg1ENbBZo9mZ724rMbPY,8358
-fosslight_scanner/fosslight_scanner.py,sha256=EftUvIHIzWm6yOOGyPFCRV_IkT-2YFcoKSDrVEIea2I,20841
+fosslight_scanner/common.py,sha256=0LgXlGOJVB0kDeZ-1VeHEErArh7TgXkwEAmYAL9q93I,8465
+fosslight_scanner/fosslight_scanner.py,sha256=MIjKJ_HHyKKlh3HhuTtuezxTmX9guDWYDgjdXZP3IPU,21001
 fosslight_scanner/resources/bom_compare.html,sha256=VocJ9bDmQQOwfGyvXatPZ4W-QddO-IlsAvKdO0nZ7pA,2240
-fosslight_scanner-2.1.5.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-fosslight_scanner-2.1.5.dist-info/METADATA,sha256=zYAaQtJeI4-BZ7Gm1FUsNEfFTvZxrbK9vW6V49fqZUg,7873
-fosslight_scanner-2.1.5.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-fosslight_scanner-2.1.5.dist-info/entry_points.txt,sha256=0tBUtN9pKtAkuohQuhbzuohdHbeoI0-w95aWAR7J_RU,105
-fosslight_scanner-2.1.5.dist-info/top_level.txt,sha256=43_xLb5KYpy8wOU1H2Wd2fEsWBY7Dg6ZEJJXkfT64Ak,18
-fosslight_scanner-2.1.5.dist-info/RECORD,,
+fosslight_scanner-2.1.7.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+fosslight_scanner-2.1.7.dist-info/METADATA,sha256=TCITJqWRZ5MZd8Xb7YccX6Ps_YZcjnjH77YhfY1KiCY,7873
+fosslight_scanner-2.1.7.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+fosslight_scanner-2.1.7.dist-info/entry_points.txt,sha256=0tBUtN9pKtAkuohQuhbzuohdHbeoI0-w95aWAR7J_RU,105
+fosslight_scanner-2.1.7.dist-info/top_level.txt,sha256=43_xLb5KYpy8wOU1H2Wd2fEsWBY7Dg6ZEJJXkfT64Ak,18
+fosslight_scanner-2.1.7.dist-info/RECORD,,