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.
Signed-off-by: Colin McAllister <colinmca...@gmail.com>
---
meta/lib/oe/cve_check.py | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/meta/lib/oe/cve_check.py b/meta/lib/oe/cve_check.py
index 647a94f5af..280f9f613d 100644
--- a/meta/lib/oe/cve_check.py
+++ b/meta/lib/oe/cve_check.py
@@ -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
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#209181):
https://lists.openembedded.org/g/openembedded-core/message/209181
Mute This Topic: https://lists.openembedded.org/mt/110347355/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
