Fix flaw on pysymcheck integration

priv-kweihmann · Feb 28, 2019 · 7c545db · 7c545db
1 parent 43ceee6
commit 7c545db
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/classes/sca-conv-checkstyle-pysymcheck.bbclass b/classes/sca-conv-checkstyle-pysymcheck.bbclass
@@ -14,7 +14,7 @@ def do_sca_conv_pysymcheck(d):
     buildpath = d.getVar("SCA_SOURCES_DIR", True)
 
     items = []
-    pattern = r"^(?P<file>.*):(?P<severity>.*):(?P<id>,*):\s+(?P<message>.*)"
+    pattern = r"^(?P<file>.*):(?P<severity>.*):(?P<id>.*):\s+(?P<message>.*)"
 
     class SymItem():
         File = ""

diff --git a/classes/sca-pysymcheck.bbclass b/classes/sca-pysymcheck.bbclass
@@ -3,7 +3,7 @@ SCA_PYSYMCHECK_EXTRA_SUPPRESS ?= ""
 ## Add ids to lead to a fatal on a recipe level
 SCA_PYSYMCHECK_EXTRA_FATAL ?= ""
 ## Used rule file
-SCA_PYSYMCHECK_RULE_FILE ?= "basic-rules.json"
+SCA_PYSYMCHECK_RULE_FILE ?= "basic_rules.json"
 
 inherit sca-helper
 inherit sca-conv-checkstyle-pysymcheck
@@ -24,6 +24,9 @@ python do_sca_pysymcheck() {
     _args += ["--libpath", ":".join([d.getVar("STAGING_LIBDIR_NATIVE")])]
     _args += [os.path.join(d.getVar("STAGING_BINDIR_NATIVE"), "pysymbolcheck", d.getVar("SCA_PYSYMCHECK_RULE_FILE"))]
 
+    if not os.path.exists(os.path.join(d.getVar("STAGING_BINDIR_NATIVE"), "pysymbolcheck", d.getVar("SCA_PYSYMCHECK_RULE_FILE"))):
+        bb.warn("Rule-File {} does not exists - Empty results will be expected".format(d.getVar("SCA_PYSYMCHECK_RULE_FILE")))
+
     _files = get_files_by_mimetype(d, d.getVar("B"), ["application/x-executable", 'application/x-sharedlib'], [])
     ## Run
     cmd_output = ""