binman: Drop the underscore in _ReadEntries()

This function can be overridden so should not have an underscore. Drop it.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2021-11-23 11:03:45 -07:00
parent 557693ef7e
commit 1e99bc2923
4 changed files with 8 additions and 8 deletions

View File

@ -48,4 +48,4 @@ class Entry_blob_phase(Entry_section):
subnode = state.AddSubnode(self._node, name)
# Read entries again, now that we have some
self._ReadEntries()
self.ReadEntries()

View File

@ -171,7 +171,7 @@ class Entry_cbfs(Entry):
self._cbfs_arg = fdt_util.GetString(node, 'cbfs-arch', 'x86')
self.align_default = None
self._cbfs_entries = OrderedDict()
self._ReadSubnodes()
self.ReadEntries()
self.reader = None
def ObtainContents(self, skip=None):
@ -204,7 +204,7 @@ class Entry_cbfs(Entry):
self.SetContents(data)
return True
def _ReadSubnodes(self):
def ReadEntries(self):
"""Read the subnodes to find out what should go in this CBFS"""
for node in self._node.subnodes:
entry = Entry.Create(self, node)

View File

@ -64,4 +64,4 @@ class Entry_files(Entry_section):
state.AddInt(subnode, 'align', self._files_align)
# Read entries again, now that we have some
self._ReadEntries()
self.ReadEntries()

View File

@ -85,9 +85,9 @@ class Entry_section(Entry):
if filename:
self._filename = filename
self._ReadEntries()
self.ReadEntries()
def _ReadEntries(self):
def ReadEntries(self):
for node in self._node.subnodes:
if node.name.startswith('hash') or node.name.startswith('signature'):
continue
@ -741,5 +741,5 @@ class Entry_section(Entry):
missing: List of missing properties / entry args, each a string
"""
if not self._ignore_missing:
entry.Raise('Missing required properties/entry args: %s' %
(', '.join(missing)))
missing = ', '.join(missing)
entry.Raise(f'Missing required properties/entry args: {missing}')