fosslight-scanner 2.1.4__py3-none-any.whl → 2.1.6__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
@@ -116,11 +117,10 @@ def create_scancodejson(all_scan_item_origin, ui_mode_report, src_path=""):
 
     try:
         all_scan_item = copy.deepcopy(all_scan_item_origin)
-        if FOSSLIGHT_DEPENDENCY in all_scan_item.file_items:
-            del all_scan_item.file_items[FOSSLIGHT_DEPENDENCY]
         if all_scan_item.file_items:
-            first_sheet = next(iter(all_scan_item.file_items))
-        else:
+            first_sheet = next((item for item in all_scan_item.file_items if item != FOSSLIGHT_DEPENDENCY),
+                                None)
+        if not first_sheet:
             first_sheet = FOSSLIGHT_SOURCE
             all_scan_item.file_items[first_sheet] = []
         if src_path:
@@ -178,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
@@ -191,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-2.1.4.dist-info → fosslight_scanner-2.1.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fosslight-scanner
-Version: 2.1.4
+Version: 2.1.6
 Summary: FOSSLight Scanner
 Home-page: https://github.com/fosslight/fosslight_scanner
 Author: LG Electronics
@@ -21,7 +21,7 @@ Requires-Dist: openpyxl
 Requires-Dist: progress
 Requires-Dist: pyyaml
 Requires-Dist: beautifulsoup4
-Requires-Dist: fosslight-util<3.0.0,>=2.1.6
+Requires-Dist: fosslight-util<3.0.0,>=2.1.12
 Requires-Dist: fosslight-source<3.0.0,>=2.1.4
 Requires-Dist: fosslight-dependency<5.0.0,>=4.1.3
 Requires-Dist: fosslight-binary<6.0.0,>=5.1.2

{fosslight_scanner-2.1.4.dist-info → fosslight_scanner-2.1.6.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=PLAp1HLBQnsBY7pIq76z2RuSWeA5tuR6rQHw61IJrE0,8385
+fosslight_scanner/common.py,sha256=0LgXlGOJVB0kDeZ-1VeHEErArh7TgXkwEAmYAL9q93I,8465
 fosslight_scanner/fosslight_scanner.py,sha256=EftUvIHIzWm6yOOGyPFCRV_IkT-2YFcoKSDrVEIea2I,20841
 fosslight_scanner/resources/bom_compare.html,sha256=VocJ9bDmQQOwfGyvXatPZ4W-QddO-IlsAvKdO0nZ7pA,2240
-fosslight_scanner-2.1.4.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-fosslight_scanner-2.1.4.dist-info/METADATA,sha256=3Ul5Kwh_OKE4ptzrNNHw_PlA52u5UbUofpcdnhDirps,7872
-fosslight_scanner-2.1.4.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-fosslight_scanner-2.1.4.dist-info/entry_points.txt,sha256=0tBUtN9pKtAkuohQuhbzuohdHbeoI0-w95aWAR7J_RU,105
-fosslight_scanner-2.1.4.dist-info/top_level.txt,sha256=43_xLb5KYpy8wOU1H2Wd2fEsWBY7Dg6ZEJJXkfT64Ak,18
-fosslight_scanner-2.1.4.dist-info/RECORD,,
+fosslight_scanner-2.1.6.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+fosslight_scanner-2.1.6.dist-info/METADATA,sha256=g3mRdT_wV9E0QNyN0SL15rJzObJR0GByXFz4tewi6fY,7873
+fosslight_scanner-2.1.6.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+fosslight_scanner-2.1.6.dist-info/entry_points.txt,sha256=0tBUtN9pKtAkuohQuhbzuohdHbeoI0-w95aWAR7J_RU,105
+fosslight_scanner-2.1.6.dist-info/top_level.txt,sha256=43_xLb5KYpy8wOU1H2Wd2fEsWBY7Dg6ZEJJXkfT64Ak,18
+fosslight_scanner-2.1.6.dist-info/RECORD,,