[oe-commits] Richard Purdie : packagedata.py: Fix read_subpkgdata_dict()
git version control
git at git.openembedded.org
Thu Jun 23 15:02:40 UTC 2011
Module: openembedded-core.git
Branch: master
Commit: ad098e40e8c57727892819e131bf18308bf244d2
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=ad098e40e8c57727892819e131bf18308bf244d2
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
Date: Thu Jun 23 16:01:18 2011 +0100
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 at linuxfoundation.org>
---
meta/lib/oe/packagedata.py | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/meta/lib/oe/packagedata.py b/meta/lib/oe/packagedata.py
index ee10a23..918e7ad 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
More information about the Openembedded-commits
mailing list