packagedata.py: Fix read_subpkgdata_dict()
If both VAR and VAR_foo are in subd, we need to ensure VAR_foo gets returned. Currently the code would work randomly. The only current user is the rpm packaging backend. (From OE-Core rev: ad098e40e8c57727892819e131bf18308bf244d2) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
b97b3e85ac
commit
2fd3fc0b5e
|
@ -58,6 +58,8 @@ def read_subpkgdata_dict(pkg, d):
|
|||
subd = read_pkgdatafile(get_subpkgedata_fn(pkg, d))
|
||||
for var in subd:
|
||||
newvar = var.replace("_" + pkg, "")
|
||||
if newvar == var and var + "_" + pkg in subd:
|
||||
continue
|
||||
ret[newvar] = subd[var]
|
||||
return ret
|
||||
|
||||
|
|
Loading…
Reference in New Issue