From 5cd9d19813d8cbe2e74d4fdbd424b6a15ca828c8 Mon Sep 17 00:00:00 2001 From: Lee Chee Yang Date: Fri, 27 Mar 2020 11:57:43 +0800 Subject: cve-update-db-native: clean DB if temporary file exist when do_populate_cve_db forced stop at certain point, the DB execution are stoped however the temporary database file (DB-JOURNAL) are not removed. This db-journal file indicates that DB is incomplete and set DB in readonly mode. So when db-journal exist, remove both DB and the db-journal and build the DB again from scratch. [YOCTO #13682] (From OE-Core rev: 70713df25b8ae27a21e53b0b9234567d7053800a) Signed-off-by: Lee Chee Yang Signed-off-by: Richard Purdie --- meta/recipes-core/meta/cve-update-db-native.bb | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'meta/recipes-core/meta') diff --git a/meta/recipes-core/meta/cve-update-db-native.bb b/meta/recipes-core/meta/cve-update-db-native.bb index 95a0dfcc90..6afe09140b 100644 --- a/meta/recipes-core/meta/cve-update-db-native.bb +++ b/meta/recipes-core/meta/cve-update-db-native.bb @@ -13,8 +13,15 @@ deltask do_install deltask do_populate_sysroot python () { - if not d.getVar("CVE_CHECK_DB_FILE"): + cve_check_db_file = d.getVar("CVE_CHECK_DB_FILE") + if not cve_check_db_file: 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_populate_cve_db() { -- cgit v1.2.3-54-g00ecf