mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-09-21 23:21:58 +00:00
binman: Show filename in missing blob help message
Show the filename next to the node path in missing blob help messages, also show a generic missing blob message when there was no help message for the help tag. Signed-off-by: Jonas Karlman <jonas@kwiboo.se> Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
parent
c2600155af
commit
8f452bc557
2 changed files with 12 additions and 3 deletions
|
@ -112,8 +112,8 @@ def _ReadMissingBlobHelp():
|
|||
_FinishTag(tag, msg, result)
|
||||
return result
|
||||
|
||||
def _ShowBlobHelp(level, path, text):
|
||||
tout.do_output(level, '%s:' % path)
|
||||
def _ShowBlobHelp(level, path, text, fname):
|
||||
tout.do_output(level, '%s (%s):' % (path, fname))
|
||||
for line in text.splitlines():
|
||||
tout.do_output(level, ' %s' % line)
|
||||
tout.do_output(level, '')
|
||||
|
@ -133,10 +133,17 @@ def _ShowHelpForMissingBlobs(level, missing_list):
|
|||
tags = entry.GetHelpTags()
|
||||
|
||||
# Show the first match help message
|
||||
shown_help = False
|
||||
for tag in tags:
|
||||
if tag in missing_blob_help:
|
||||
_ShowBlobHelp(level, entry._node.path, missing_blob_help[tag])
|
||||
_ShowBlobHelp(level, entry._node.path, missing_blob_help[tag],
|
||||
entry.GetDefaultFilename())
|
||||
shown_help = True
|
||||
break
|
||||
# Or a generic help message
|
||||
if not shown_help:
|
||||
_ShowBlobHelp(level, entry._node.path, "Missing blob",
|
||||
entry.GetDefaultFilename())
|
||||
|
||||
def GetEntryModules(include_testing=True):
|
||||
"""Get a set of entry class implementations
|
||||
|
|
|
@ -3806,6 +3806,7 @@ class TestFunctional(unittest.TestCase):
|
|||
allow_missing=True)
|
||||
self.assertEqual(103, ret)
|
||||
err = stderr.getvalue()
|
||||
self.assertIn('(missing-file)', err)
|
||||
self.assertRegex(err, "Image 'image'.*missing.*: blob-ext")
|
||||
self.assertIn('Some images are invalid', err)
|
||||
|
||||
|
@ -3816,6 +3817,7 @@ class TestFunctional(unittest.TestCase):
|
|||
allow_missing=True, ignore_missing=True)
|
||||
self.assertEqual(0, ret)
|
||||
err = stderr.getvalue()
|
||||
self.assertIn('(missing-file)', err)
|
||||
self.assertRegex(err, "Image 'image'.*missing.*: blob-ext")
|
||||
self.assertIn('Some images are invalid', err)
|
||||
|
||||
|
|
Loading…
Reference in a new issue