binman: Add a way to check for missing properties

Some new entries are likely to have required properties. Support this in a
standard way, with a list of required properties which can be set up by
base classes. Check for missing properties when the entry is read.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2022-08-13 11:40:44 -06:00
parent 24474dc20a
commit cdadadab7d
3 changed files with 22 additions and 3 deletions

View file

@ -84,6 +84,8 @@ class Entry(object):
update_hash: True if this entry's "hash" subnode should be
updated with a hash of the entry contents
fake_fname: Fake filename, if one was created, else None
required_props (dict of str): Properties which must be present. This can
be added to by subclasses
"""
fake_dir = None
@ -121,6 +123,7 @@ class Entry(object):
self.missing_bintools = []
self.update_hash = True
self.fake_fname = None
self.required_props = []
@staticmethod
def FindEntryClass(etype, expanded):
@ -238,6 +241,7 @@ class Entry(object):
This reads all the fields we recognise from the node, ready for use.
"""
self.ensure_props()
if 'pos' in self._node.props:
self.Raise("Please use 'offset' instead of 'pos'")
if 'expand-size' in self._node.props:
@ -1184,3 +1188,19 @@ features to produce new behaviours.
if not os.path.exists(cls.fake_dir):
os.mkdir(cls.fake_dir)
tout.notice(f"Fake-blob dir is '{cls.fake_dir}'")
def ensure_props(self):
"""Raise an exception if properties are missing
Args:
prop_list (list of str): List of properties to check for
Raises:
ValueError: Any property is missing
"""
not_present = []
for prop in self.required_props:
if not prop in self._node.props:
not_present.append(prop)
if not_present:
self.Raise(f"'{self.etype}' entry is missing properties: {' '.join(not_present)}")