michaelh/zephyr
1
0
Fork 0
Code Releases Activity

scripts: edtlib: Fix broken 'required: true' check for booleans

Browse source 
Node._prop_val() returned too early for non-existent booleans, letting
missing 'required: true' booleans slip through without an error.

Fix it by rearranging the code to always do the 'required' check before
returning.

Signed-off-by: Ulf Magnusson <Ulf.Magnusson@nordicsemi.no>
This commit is contained in:
Ulf Magnusson 2019-09-30 16:42:07 +02:00 • committed by Kumar Gala
commit 0c4f4a91b0
1 changed files with 8 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

18
scripts/dts/edtlib.py
View file

@ -894,15 +894,6 @@ class Node:
node = self._node
prop = node.props.get(name)
if prop_type == "boolean":
if not prop:
return False
if prop.type is not TYPE_EMPTY:
_err("'{0}' in {1!r} is defined with 'type: boolean' in {2}, "
"but is assigned a value ('{3}') instead of being empty "
"('{0};')".format(name, node, self.binding_path, prop))
return True
if not prop:
if required and self.enabled:
_err("'{}' is marked as required in 'properties:' in {}, but "
@ -918,7 +909,14 @@ class Node:
return bytes(default)
return default
return None
return False if prop_type == "boolean" else None
if prop_type == "boolean":
if prop.type is not TYPE_EMPTY:
_err("'{0}' in {1!r} is defined with 'type: boolean' in {2}, "
"but is assigned a value ('{3}') instead of being empty "
"('{0};')".format(name, node, self.binding_path, prop))
return True
if prop_type == "int":
return prop.to_num()