summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@arm.com>2023-10-23 18:38:22 +0100
committerSteve Sakoman <steve@sakoman.com>2023-11-11 08:23:01 -1000
commitea56fc0611c205980e7aba441b5b82a0fa4e0e50 (patch)
tree84b004f2e9c17567316d7c038416afa8925864c1
parentfb3a1733c07cb601069b23a2c73b778d6654cd35 (diff)
downloadpoky-ea56fc0611c205980e7aba441b5b82a0fa4e0e50.tar.gz
cve-check: slightly more verbose warning when adding the same package twice
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. (From OE-Core rev: 7d7d1de6211b2813c1679bb9ce35289607d66c12) 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>
-rw-r--r--meta/lib/oe/cve_check.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/lib/oe/cve_check.py b/meta/lib/oe/cve_check.py
index dbaa0b373a..b4c9f6ffe3 100644
--- a/meta/lib/oe/cve_check.py
+++ b/meta/lib/oe/cve_check.py
@@ -165,7 +165,7 @@ def cve_check_merge_jsons(output, data):
165 165
166 for product in output["package"]: 166 for product in output["package"]:
167 if product["name"] == data["package"][0]["name"]: 167 if product["name"] == data["package"][0]["name"]:
168 bb.error("Error adding the same package twice") 168 bb.error("Error adding the same package %s twice" % product["name"])
169 return 169 return
170 170
171 output["package"].append(data["package"][0]) 171 output["package"].append(data["package"][0])