summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorChris Laplante <chris.laplante@agilent.com>2020-09-14 11:33:19 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-09-15 11:53:28 +0100
commitdfbfc11a7aad21355fcf004aa07de3e5a5806363 (patch)
tree1dad2d4129157c9232b728b5e379ff7780f83cc4 /meta
parenta834ee990fb42f49a7b3401c78f77ef8be3e5ed3 (diff)
downloadpoky-dfbfc11a7aad21355fcf004aa07de3e5a5806363.tar.gz
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 <chris.laplante@agilent.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/meta/cve-update-db-native.bb14
1 files changed, 8 insertions, 6 deletions
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
15python () { 15python () {
16 if not bb.data.inherits_class("cve-check", d): 16 if not bb.data.inherits_class("cve-check", d):
17 raise bb.parse.SkipRecipe("Skip recipe when cve-check class is not loaded.") 17 raise bb.parse.SkipRecipe("Skip recipe when cve-check class is not loaded.")
18
19 if os.path.exists("%s-journal" % cve_check_db_file ):
20 os.remove("%s-journal" % cve_check_db_file)
21
22 if os.path.exists(cve_check_db_file):
23 os.remove(cve_check_db_file)
24} 18}
25 19
26python do_fetch() { 20python do_fetch() {
@@ -41,6 +35,14 @@ python do_fetch() {
41 db_dir = os.path.dirname(db_file) 35 db_dir = os.path.dirname(db_file)
42 json_tmpfile = os.path.join(db_dir, 'nvd.json.gz') 36 json_tmpfile = os.path.join(db_dir, 'nvd.json.gz')
43 37
38 if os.path.exists("{0}-journal".format(db_file)):
39 # If a journal is present the last update might have been interrupted. In that case,
40 # just wipe any leftovers and force the DB to be recreated.
41 os.remove("{0}-journal".format(db_file))
42
43 if os.path.exists(db_file):
44 os.remove(db_file)
45
44 # Don't refresh the database more than once an hour 46 # Don't refresh the database more than once an hour
45 try: 47 try:
46 import time 48 import time