mirror of
https://git.yoctoproject.org/poky
synced 2026-04-04 23:02:22 +02:00
cve-check: Fix errors in log lines
Two warning lines in cve_check.py reference a variable that doesn't exist. These would cause a runtime error if the conditions they are hidden in were to be entered. The log lines have been updated to no longer reference an undefined variable. (From OE-Core rev: c9d059e8a362b3c9d604f7ebe8fd1dd994f0af6b) Signed-off-by: Colin McAllister <colinmca242@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
7f9b94a8a2
commit
db2146dbe6
@@ -253,7 +253,10 @@ def decode_cve_status(d, cve):
|
||||
description = status_split[4].strip()
|
||||
elif len(status_split) >= 2 and status_split[1].strip() == "cpe":
|
||||
# Malformed CPE
|
||||
bb.warn('Invalid CPE information for CVE_STATUS[%s] = "%s", not setting CPE' % (detail, cve, status))
|
||||
bb.warn(
|
||||
'Invalid CPE information for CVE_STATUS[%s] = "%s", not setting CPE'
|
||||
% (cve, status)
|
||||
)
|
||||
else:
|
||||
# Other case: no CPE, the syntax is then:
|
||||
# detail: description
|
||||
@@ -263,9 +266,13 @@ def decode_cve_status(d, cve):
|
||||
status_out["product"] = product
|
||||
status_out["description"] = description
|
||||
|
||||
status_mapping = d.getVarFlag("CVE_CHECK_STATUSMAP", status_out['detail'])
|
||||
detail = status_out["detail"]
|
||||
status_mapping = d.getVarFlag("CVE_CHECK_STATUSMAP", detail)
|
||||
if status_mapping is None:
|
||||
bb.warn('Invalid detail "%s" for CVE_STATUS[%s] = "%s", fallback to Unpatched' % (detail, cve, status))
|
||||
bb.warn(
|
||||
'Invalid detail "%s" for CVE_STATUS[%s] = "%s", fallback to Unpatched'
|
||||
% (detail, cve, status)
|
||||
)
|
||||
status_mapping = "Unpatched"
|
||||
status_out["mapping"] = status_mapping
|
||||
|
||||
|
||||
Reference in New Issue
Block a user