michaelh/zephyr
1
0
Fork 0
Code Releases Activity

scripts: dts: Fix wrong filename in 'include:' code in old scripts

Browse source 
The 'fname' parameter to merge_included_bindings(), giving the path to
the top-level binding file, was accidentally shadowed in the
'for fname in fnames:' loop. This could lead to the wrong filename being
used in error messages.

Discovered via this pylint warning:

    scripts/dts/extract_dts_includes.py:225:12: R1704: Redefining
    argument with the local name 'fname' (redefined-argument-from-local)

Improve naming a bit to fix it.

Signed-off-by: Ulf Magnusson <Ulf.Magnusson@nordicsemi.no>
This commit is contained in:
Ulf Magnusson 2019-09-10 16:40:02 +02:00 • committed by Kumar Gala
commit a5f4ad8df3
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
scripts/dts/extract_dts_includes.py
View file

@ -218,12 +218,12 @@ def merge_included_bindings(fname, node):
res = node
if "include" in node:
fnames = node.pop("include")
if isinstance(fnames, str):
fnames = [fnames]
included = node.pop("include")
if isinstance(included, str):
included = [included]
for fname in fnames:
binding = load_binding_file(fname)
for included_fname in included:
binding = load_binding_file(included_fname)
inherited = merge_included_bindings(fname, binding)
merge_properties(None, fname, inherited, res)
res = inherited