]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core.git/commitdiff
cve-check: slightly more verbose warning when adding the same package twice
authorRoss Burton <ross.burton@arm.com>
Mon, 23 Oct 2023 17:38:22 +0000 (18:38 +0100)
committerSteve Sakoman <steve@sakoman.com>
Wed, 8 Nov 2023 02:31:19 +0000 (16:31 -1000)
Occasionally the cve-check tool will warn that it is adding the same
package twice.  Knowing what this package is might be the first step
towards understanding where this message comes from.

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit c1179faec8583a8b7df192cf1cbf221f0e3001fc)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
meta/lib/oe/cve_check.py

index dbaa0b373a3c59ceb4c1a9e0a000a2c302bff09d..b4c9f6ffe32c0d1266b6b07d996a9b38ee175fc9 100644 (file)
@@ -165,7 +165,7 @@ def cve_check_merge_jsons(output, data):
 
     for product in output["package"]:
         if product["name"] == data["package"][0]["name"]:
-            bb.error("Error adding the same package twice")
+            bb.error("Error adding the same package %s twice" % product["name"])
             return
 
     output["package"].append(data["package"][0])