From 38cbabba6f7d012a7adad526c3a6e2521c154c72 Mon Sep 17 00:00:00 2001 From: Jono Yang Date: Tue, 5 Nov 2024 12:50:42 -0800 Subject: [PATCH 1/2] Update go-inspector to v0.5.0 Signed-off-by: Jono Yang --- requirements-linux.txt | 2 +- setup-mini.cfg | 2 +- setup.cfg | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements-linux.txt b/requirements-linux.txt index cd7dbabc2f..9269a7bd04 100644 --- a/requirements-linux.txt +++ b/requirements-linux.txt @@ -1,4 +1,4 @@ packagedcode-msitools==0.101.210706 regipy==3.1.0 rpm-inspector-rpm==4.16.1.3.210404 -go-inspector==0.3.1 +go-inspector==0.5.0 diff --git a/setup-mini.cfg b/setup-mini.cfg index e435bd76c7..cd48f30d97 100644 --- a/setup-mini.cfg +++ b/setup-mini.cfg @@ -149,7 +149,7 @@ packages = rpm_inspector_rpm >= 4.16.1.3; platform_system == 'Linux' regipy >= 3.1.0; platform_system == 'Linux' packagedcode_msitools >= 0.101.210706; platform_system == 'Linux' - go-inspector >= 0.3.1; platform_system == 'Linux' + go-inspector >= 0.5.0; platform_system == 'Linux' [options.entry_points] diff --git a/setup.cfg b/setup.cfg index 30fbcd9771..8d1b28e381 100644 --- a/setup.cfg +++ b/setup.cfg @@ -149,7 +149,7 @@ packages = rpm_inspector_rpm >= 4.16.1.3; platform_system == 'Linux' regipy >= 3.1.0; platform_system == 'Linux' packagedcode_msitools >= 0.101.210706; platform_system == 'Linux' - go-inspector >= 0.3.1; platform_system == 'Linux' + go-inspector >= 0.5.0; platform_system == 'Linux' [options.entry_points] From f450020b28f8b58f3d134958ea9fb09e2af6fc67 Mon Sep 17 00:00:00 2001 From: Jono Yang Date: Tue, 5 Nov 2024 16:33:42 -0800 Subject: [PATCH 2/2] Continue when an exception has been encountered during package recognition #3971 Signed-off-by: Jono Yang --- src/packagedcode/recognize.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/packagedcode/recognize.py b/src/packagedcode/recognize.py index 9dd7c64348..9c98b414e1 100644 --- a/src/packagedcode/recognize.py +++ b/src/packagedcode/recognize.py @@ -113,3 +113,11 @@ def _parse( if TRACE: raise + + except Exception as e: + # We should continue when an Exception has occured when trying to + # recognize a package + if TRACE: + logger_debug(f'_parse: Exception: {str(e)}') + + continue