summaryrefslogtreecommitdiffstats
path: root/meta/lib
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:02:40 +0100
commit2fd3fc0b5e5138c6ed5bdae1ec851fba641e5404 (patch)
treec987d76b94a71242373fcdebd0fa101ae022426d /meta/lib
parentb97b3e85ac0e428977c04d89d0f60be9822814d7 (diff)
downloadpoky-2fd3fc0b5e5138c6ed5bdae1ec851fba641e5404.tar.gz
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>
Diffstat (limited to 'meta/lib')
-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 ee10a233fa..918e7ad2cc 100644
--- a/meta/lib/oe/packagedata.py
+++ b/meta/lib/oe/packagedata.py
@@ -58,6 +58,8 @@ def read_subpkgdata_dict(pkg, d):
58 subd = read_pkgdatafile(get_subpkgedata_fn(pkg, d)) 58 subd = read_pkgdatafile(get_subpkgedata_fn(pkg, d))
59 for var in subd: 59 for var in subd:
60 newvar = var.replace("_" + pkg, "") 60 newvar = var.replace("_" + pkg, "")
61 if newvar == var and var + "_" + pkg in subd:
62 continue
61 ret[newvar] = subd[var] 63 ret[newvar] = subd[var]
62 return ret 64 return ret
63 65