mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-31 12:49:46 +00:00
Code Issues Projects Releases Wiki Activity

packagedata.py: Fix read_subpkgdata_dict()

Browse Source 
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:
Richard Purdie
2011-06-23 16:01:18 +01:00
parent b97b3e85ac
commit 2fd3fc0b5e
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/lib/oe/packagedata.py
+2
View File
@@ -58,6 +58,8 @@ def read_subpkgdata_dict(pkg, d):
subd = read_pkgdatafile(get_subpkgedata_fn(pkg, d)) subd = read_pkgdatafile(get_subpkgedata_fn(pkg, d))
for var in subd: for var in subd:
newvar = var.replace("_" + pkg, "") newvar = var.replace("_" + pkg, "")
if newvar == var and var + "_" + pkg in subd:
continue
ret[newvar] = subd[var] ret[newvar] = subd[var]
return ret return ret