StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix inheritance order

Browse Source 
The children to inherit from were not sorted. This
wasn't a problem for list variables, because all those
inheritances get merged together based on the @inherit/
values in the list variables. But for single value variables
it made a difference.

Bug: 226206409
Test: ./out/rbcrun ./build/make/tests/run.rbc
Change-Id: Ib56bbb91a79fe8c7cb780c253f5bd8d6c0e87765
This commit is contained in:
Cole Faust
2022-03-31 17:25:20 -07:00
parent bcabb923dc
commit 670c587c09
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/product_config.rbc
View File

@@ -167,8 +167,8 @@ def _product_configuration(top_pcm_name, top_pcm, input_variables_init):
# Now we know everything about this PCM, record it in 'configs'. # Now we know everything about this PCM, record it in 'configs'.
children = handle.inherited_modules children = handle.inherited_modules
if _options.trace_modules: if _options.trace_modules:
print("# ", " ".join(children.keys())) print("# ", " ".join(sorted(children.keys())))
configs[name] = (pcm, handle.cfg, children.keys(), False) configs[name] = (pcm, handle.cfg, sorted(children.keys()), False)
pcm_count = pcm_count + 1 pcm_count = pcm_count + 1
if len(children) == 0: if len(children) == 0:

2
tests/single_value_inheritance/product.rbc
View File

@@ -18,7 +18,7 @@ load(":inherit2.rbc", _inherit2_init = "init")
def init(g, handle): def init(g, handle):
cfg = rblf.cfg(handle) cfg = rblf.cfg(handle)
rblf.inherit(handle, "test/inherit1", _inherit1_init)
rblf.inherit(handle, "test/inherit2", _inherit2_init) rblf.inherit(handle, "test/inherit2", _inherit2_init)
rblf.inherit(handle, "test/inherit1", _inherit1_init)
cfg["PRODUCT_DEFAULT_DEV_CERTIFICATE"] = "" cfg["PRODUCT_DEFAULT_DEV_CERTIFICATE"] = ""