Merge pull request #19 from blackducksoftware/dev

v1.0.17 - Minor fix to pkg_type in RecipeListClass.py

README.md

@@ -1,4 +1,4 @@
-# Black Duck SCA Scan Yocto Script - bd_scan_yocto_via_sbom.py v1.0.16
+# Black Duck SCA Scan Yocto Script - bd_scan_yocto_via_sbom.py v1.0.17
 
 # PROVISION OF THIS SCRIPT
 This script is provided under the MIT license (see LICENSE file).

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "bd_scan_yocto_via_sbom"
-version = "1.0.16"
+version = "1.0.17"
 authors = [
   { name="Matthew Brady", email="[email protected]" },
 ]

yocto_import_sbom/ConfigClass.py

@@ -4,7 +4,7 @@
 import sys
 from .OEClass import OE
 
-script_version = "v1.0.16"
+script_version = "v1.0.17"
 
 class Config:
     def __init__(self):

yocto_import_sbom/RecipeListClass.py

@@ -94,7 +94,7 @@ def find_files(self, conf, all_pkg_files, all_download_files):
             recipe_esc = re.escape(recipe.name)
             ver_esc = re.escape(recipe.version)
             download_regex = re.compile(rf"^{recipe_esc}[_-]v?{ver_esc}[.-].*$")
-            pkg_regex = re.compile(rf"^(lib)?{recipe_esc}\d*[_-]v?{ver_esc}[+.-].*\.{conf.image_pkgtype}")
+            pkg_regex = re.compile(rf"^(lib)?{recipe_esc}\d*[_-]v?{ver_esc}[+.-].*\.{conf.image_package_type}")
 
             for path in all_download_files:
                 filename = os.path.basename(path)