summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-06-23 16:01:18 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-06-23 16:01:20 +0100
commitad098e40e8c57727892819e131bf18308bf244d2 (patch)
tree74d09618399bd4d6a8ea8b1bd287a5aa3c145080
parentc2ce3573fb2816cd2023a56b364fae4c0f4455ae (diff)
downloadopenembedded-core-ad098e40e8c57727892819e131bf18308bf244d2.tar.gz
openembedded-core-ad098e40e8c57727892819e131bf18308bf244d2.tar.bz2
openembedded-core-ad098e40e8c57727892819e131bf18308bf244d2.tar.xz
openembedded-core-ad098e40e8c57727892819e131bf18308bf244d2.zip
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. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/lib/oe/packagedata.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/meta/lib/oe/packagedata.py b/meta/lib/oe/packagedata.py
index ee10a233f..918e7ad2c 100644
--- a/meta/lib/oe/packagedata.py
+++ b/meta/lib/oe/packagedata.py
@@ -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