summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2019-12-08 18:35:56 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-12-16 23:11:10 (GMT)
commit51553d9da2ada4a912110d5ecd4b4bc5d020f80f (patch)
treecc40c7d519d07fbce2668b9c0dbb5ba4ee425bf5
parent1a09e2a3cf3efe67f2f01e1d1d8f65b5e337e3fb (diff)
downloadpoky-51553d9da2ada4a912110d5ecd4b4bc5d020f80f.tar.gz
cve-check: neaten get_cve_info
Remove obsolete Python 2 code, and use convenience methods for neatness. (From OE-Core rev: f19253cc9e70c974a8e21a142086c13d7cde04ff) (From OE-Core rev: 1f3863bc31e03207856f55591cbf17543e188587) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/cve-check.bbclass18
1 files changed, 5 insertions, 13 deletions
diff --git a/meta/classes/cve-check.bbclass b/meta/classes/cve-check.bbclass
index c1cbdbd..e95716d 100644
--- a/meta/classes/cve-check.bbclass
+++ b/meta/classes/cve-check.bbclass
@@ -261,23 +261,15 @@ def check_cves(d, patched_cves):
261def get_cve_info(d, cves): 261def get_cve_info(d, cves):
262 """ 262 """
263 Get CVE information from the database. 263 Get CVE information from the database.
264
265 Unfortunately the only way to get CVE info is set the output to
266 html (hard to parse) or query directly the database.
267 """ 264 """
268 265
269 try: 266 import sqlite3
270 import sqlite3
271 except ImportError:
272 from pysqlite2 import dbapi2 as sqlite3
273 267
274 cve_data = {} 268 cve_data = {}
275 db_file = d.getVar("CVE_CHECK_DB_FILE") 269 conn = sqlite3.connect(d.getVar("CVE_CHECK_DB_FILE"))
276 placeholder = ",".join("?" * len(cves)) 270 placeholders = ",".join("?" * len(cves))
277 query = "SELECT * FROM NVD WHERE id IN (%s)" % placeholder 271 query = "SELECT * FROM NVD WHERE id IN (%s)" % placeholders
278 conn = sqlite3.connect(db_file) 272 for row in conn.execute(query, tuple(cves)):
279 cur = conn.cursor()
280 for row in cur.execute(query, tuple(cves)):
281 cve_data[row[0]] = {} 273 cve_data[row[0]] = {}
282 cve_data[row[0]]["summary"] = row[1] 274 cve_data[row[0]]["summary"] = row[1]
283 cve_data[row[0]]["scorev2"] = row[2] 275 cve_data[row[0]]["scorev2"] = row[2]