From 4d69f690821fa2256680c078d2b477e541f6a836 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Thu, 10 Sep 2020 22:04:12 +0100 Subject: cve-update-db-native: add more logging when fetching Add some debug logging when fetching the CVE data. (From OE-Core rev: 60fa8135437ab1e2bc7cead5f838ac787c8dab26) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie (cherry picked from commit 9b230584664873af2ab453b8153b1ad276d3b0af) Signed-off-by: Steve Sakoman Signed-off-by: Richard Purdie --- meta/recipes-core/meta/cve-update-db-native.bb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/meta/recipes-core/meta/cve-update-db-native.bb b/meta/recipes-core/meta/cve-update-db-native.bb index 355ee2a2a3..e267671628 100644 --- a/meta/recipes-core/meta/cve-update-db-native.bb +++ b/meta/recipes-core/meta/cve-update-db-native.bb @@ -75,6 +75,7 @@ python do_fetch() { with bb.progress.ProgressHandler(d) as ph, open(os.path.join(d.getVar("TMPDIR"), 'cve_check'), 'a') as cve_f: total_years = date.today().year + 1 - YEAR_START for i, year in enumerate(range(YEAR_START, date.today().year + 1)): + bb.debug(2, "Updating %d" % year) ph.update((float(i + 1) / total_years) * 100) year_url = (d.getVar('NVDCVE_URL')) + str(year) meta_url = year_url + ".meta" @@ -104,6 +105,7 @@ python do_fetch() { cursor.close() if not meta or meta[0] != last_modified: + bb.debug(2, "Updating entries") # Clear products table entries corresponding to current year conn.execute("delete from PRODUCTS where ID like ?", ('CVE-%d%%' % year,)).close() @@ -117,7 +119,8 @@ python do_fetch() { cve_f.write('Warning: CVE db update error, CVE data is outdated.\n\n') bb.warn("Cannot parse CVE data (%s), update failed" % e.reason) return - + else: + bb.debug(2, "Already up to date (last modified %s)" % last_modified) # Update success, set the date to cve_check file. if year == date.today().year: cve_f.write('CVE database update : %s\n\n' % date.today()) -- cgit v1.2.3-54-g00ecf