commit 93f18a164e3215b8e3ca55170d462578eb92a600
author Simon Glass <sjg@chromium.org> Sun Mar 21 18:24:34 2021 +1300
committer Simon Glass <sjg@chromium.org> Sat Mar 27 16:26:48 2021 +1300
tree 7d3ba8287d6293f8d0d5d3101ba103dd503403f0
parent f427c5fb3b828b6074cf054455bee3012d49b8dc

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 <sjg@chromium.org>

tools/dtoc/fdt.py

diff --git a/tools/dtoc/fdt.py b/tools/dtoc/fdt.py
index 25ce513..f0d1384 100644
--- a/tools/dtoc/fdt.py
+++ b/tools/dtoc/fdt.py
@@ -339,8 +339,8 @@
             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)
 

tools/dtoc/test_fdt.py

diff --git a/tools/dtoc/test_fdt.py b/tools/dtoc/test_fdt.py
index 1c3a8a2..72095b0 100755
--- a/tools/dtoc/test_fdt.py
+++ b/tools/dtoc/test_fdt.py
@@ -209,7 +209,7 @@
         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):