From 2fd3fc0b5e5138c6ed5bdae1ec851fba641e5404 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 23 Jun 2011 16:01:18 +0100 Subject: 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 --- meta/lib/oe/packagedata.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'meta/lib') 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): 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 -- cgit v1.2.3-54-g00ecf