From dfbfc11a7aad21355fcf004aa07de3e5a5806363 Mon Sep 17 00:00:00 2001 From: Chris Laplante Date: Mon, 14 Sep 2020 11:33:19 -0400 Subject: cve-update-db-native: move -journal checking into do_fetch It was always questionable to do this in an anonymous function, but now with multiconfig it is a critical mistake and leads to more strange "Exception: sqlite3.OperationalError: disk I/O error" errors. (From OE-Core rev: fcbc9d0e8421a3a559db05005ba042337cd5d864) Signed-off-by: Chris Laplante Signed-off-by: Richard Purdie --- meta/recipes-core/meta/cve-update-db-native.bb | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'meta/recipes-core') diff --git a/meta/recipes-core/meta/cve-update-db-native.bb b/meta/recipes-core/meta/cve-update-db-native.bb index c2f713312f..242fbc2f30 100644 --- a/meta/recipes-core/meta/cve-update-db-native.bb +++ b/meta/recipes-core/meta/cve-update-db-native.bb @@ -15,12 +15,6 @@ deltask do_populate_sysroot python () { if not bb.data.inherits_class("cve-check", d): raise bb.parse.SkipRecipe("Skip recipe when cve-check class is not loaded.") - - if os.path.exists("%s-journal" % cve_check_db_file ): - os.remove("%s-journal" % cve_check_db_file) - - if os.path.exists(cve_check_db_file): - os.remove(cve_check_db_file) } python do_fetch() { @@ -41,6 +35,14 @@ python do_fetch() { db_dir = os.path.dirname(db_file) json_tmpfile = os.path.join(db_dir, 'nvd.json.gz') + if os.path.exists("{0}-journal".format(db_file)): + # If a journal is present the last update might have been interrupted. In that case, + # just wipe any leftovers and force the DB to be recreated. + os.remove("{0}-journal".format(db_file)) + + if os.path.exists(db_file): + os.remove(db_file) + # Don't refresh the database more than once an hour try: import time -- cgit v1.2.3-54-g00ecf