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-17 06:00:32 -1000
commit1b7c8a3e7ebbbf47497bf10a0a50ad81870b0fb2 (patch)
tree80095df5955bc2e4cd9747e65f6e3a0af9b51f49
parent38c0d384bdd7761eaba80e996d5ab41a3e049930 (diff)
downloadpoky-1b7c8a3e7ebbbf47497bf10a0a50ad81870b0fb2.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: e3574760ee59c1ca7d2698f09ddd37ee568f04f3) 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 c508865738..a91d691c30 100644
--- a/meta/lib/oe/cve_check.py
+++ b/meta/lib/oe/cve_check.py
@@ -75,7 +75,7 @@ def cve_check_merge_jsons(output, data):
75 75
76 for product in output["package"]: 76 for product in output["package"]:
77 if product["name"] == data["package"][0]["name"]: 77 if product["name"] == data["package"][0]["name"]:
78 bb.error("Error adding the same package twice") 78 bb.error("Error adding the same package %s twice" % product["name"])
79 return 79 return
80 80
81 output["package"].append(data["package"][0]) 81 output["package"].append(data["package"][0])