From 5c69ae26cd71fa3fdda31c9e7d112c26c9653fd8 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Thu, 5 Dec 2013 11:11:47 +0000 Subject: classes/buildhistory: fix reading of package-specific values from pkgdata When writing out variable values to pkgdata, if the value has been set in the datastore with an override for the package, we use the package name override in the pkgdata key as well; however the recently added code to read pkgdata in buildhistory.bbclass was just using the override where we normally expect to have it. However, if a recipe overrides one of the values that is normally set for the recipe on a per-package basis (e.g. the external-sourcery-toolchain recipe sets PKGV this way) then this led to KeyErrors. Re-write the pkgdata loading code to always strip off the package name override if it is present. (From OE-Core rev: e40e8e574b3688400a668d3ad76b6cef1920e3e0) Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- meta/classes/buildhistory.bbclass | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) (limited to 'meta/classes/buildhistory.bbclass') diff --git a/meta/classes/buildhistory.bbclass b/meta/classes/buildhistory.bbclass index d25496d0da..1e6d968520 100644 --- a/meta/classes/buildhistory.bbclass +++ b/meta/classes/buildhistory.bbclass @@ -187,7 +187,10 @@ python buildhistory_emit_pkghistory() { with open(os.path.join(pkgdata_dir, 'runtime', pkg)) as f: for line in f.readlines(): item = line.rstrip('\n').split(': ', 1) - pkgdata[item[0]] = item[1].decode('string_escape') + key = item[0] + if key.endswith('_' + pkg): + key = key[:-len(pkg)-1] + pkgdata[key] = item[1].decode('string_escape') pkge = pkgdata.get('PKGE', '0') pkgv = pkgdata['PKGV'] @@ -211,19 +214,19 @@ python buildhistory_emit_pkghistory() { pkginfo.pe = pkgdata.get('PE', '0') pkginfo.pv = pkgdata['PV'] pkginfo.pr = pkgdata['PR'] - pkginfo.pkg = pkgdata['PKG_%s' % pkg] + pkginfo.pkg = pkgdata['PKG'] pkginfo.pkge = pkge pkginfo.pkgv = pkgv pkginfo.pkgr = pkgr - pkginfo.rprovides = sortpkglist(squashspaces(pkgdata.get('RPROVIDES_%s' % pkg, ""))) - pkginfo.rdepends = sortpkglist(squashspaces(pkgdata.get('RDEPENDS_%s' % pkg, ""))) - pkginfo.rrecommends = sortpkglist(squashspaces(pkgdata.get('RRECOMMENDS_%s' % pkg, ""))) - pkginfo.rsuggests = sortpkglist(squashspaces(pkgdata.get('RSUGGESTS_%s' % pkg, ""))) - pkginfo.rreplaces = sortpkglist(squashspaces(pkgdata.get('RREPLACES_%s' % pkg, ""))) - pkginfo.rconflicts = sortpkglist(squashspaces(pkgdata.get('RCONFLICTS_%s' % pkg, ""))) - pkginfo.files = squashspaces(pkgdata.get('FILES_%s' % pkg, "")) + pkginfo.rprovides = sortpkglist(squashspaces(pkgdata.get('RPROVIDES', ""))) + pkginfo.rdepends = sortpkglist(squashspaces(pkgdata.get('RDEPENDS', ""))) + pkginfo.rrecommends = sortpkglist(squashspaces(pkgdata.get('RRECOMMENDS', ""))) + pkginfo.rsuggests = sortpkglist(squashspaces(pkgdata.get('RSUGGESTS', ""))) + pkginfo.rreplaces = sortpkglist(squashspaces(pkgdata.get('RREPLACES', ""))) + pkginfo.rconflicts = sortpkglist(squashspaces(pkgdata.get('RCONFLICTS', ""))) + pkginfo.files = squashspaces(pkgdata.get('FILES', "")) for filevar in pkginfo.filevars: - pkginfo.filevars[filevar] = pkgdata.get('%s_%s' % (filevar, pkg), "") + pkginfo.filevars[filevar] = pkgdata.get(filevar, "") # Gather information about packaged files val = pkgdata.get('FILES_INFO', '') @@ -232,7 +235,7 @@ python buildhistory_emit_pkghistory() { filelist.sort() pkginfo.filelist = " ".join(filelist) - pkginfo.size = int(pkgdata['PKGSIZE_%s' % pkg]) + pkginfo.size = int(pkgdata['PKGSIZE']) write_pkghistory(pkginfo, d) } -- cgit v1.2.3-54-g00ecf