From acd98611c3ca26f10b997ab09aeacd9f4b91d5f3 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Sun, 21 Mar 2021 18:24:34 +1300 Subject: [PATCH] dtoc: Improve internal error for Refresh() Add the node name too so it is easy to see which node failed. Signed-off-by: Simon Glass --- tools/dtoc/fdt.py | 4 ++-- tools/dtoc/test_fdt.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/dtoc/fdt.py b/tools/dtoc/fdt.py index 25ce5136eb..f0d1384ccc 100644 --- a/tools/dtoc/fdt.py +++ b/tools/dtoc/fdt.py @@ -339,8 +339,8 @@ class Node: p = fdt_obj.get_property_by_offset(poffset) prop = self.props.get(p.name) if not prop: - raise ValueError("Internal error, property '%s' missing, " - 'offset %d' % (p.name, poffset)) + raise ValueError("Internal error, node '%s' property '%s' missing, " + 'offset %d' % (self.path, p.name, poffset)) prop.RefreshOffset(poffset) poffset = fdt_obj.next_property_offset(poffset, QUIET_NOTFOUND) diff --git a/tools/dtoc/test_fdt.py b/tools/dtoc/test_fdt.py index 1c3a8a2ab1..72095b0543 100755 --- a/tools/dtoc/test_fdt.py +++ b/tools/dtoc/test_fdt.py @@ -209,7 +209,7 @@ class TestNode(unittest.TestCase): del self.node.props['notstring'] with self.assertRaises(ValueError) as e: self.dtb.Refresh() - self.assertIn("Internal error, property 'notstring' missing, offset ", + self.assertIn("Internal error, node '/spl-test' property 'notstring' missing, offset ", str(e.exception)) def testLookupPhandle(self): -- 2.39.5