mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-02 13:29:49 +00:00
Code Issues Projects Releases Wiki Activity

bitbake: hob: use correct semantics for dealing with pkgdata

Browse Source 
Some of these values may or may not be overridden on a per-package
basis, so handle them accordingly.

(Bitbake rev: 56cee6a958843b03c5389d4a45245a04d1e03327)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Paul Eggleton
2012-09-10 15:36:29 +01:00
committed by Richard Purdie
parent a4e36563d9
commit 4ec3d72072
1 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bitbake/lib/bb/ui/crumbs/hoblistmodel.py
+20 -15
View File
@@ -145,6 +145,12 @@ class PackageListModel(gtk.TreeStore):
self.pkg_path = {} self.pkg_path = {}
self.rprov_pkg = {} self.rprov_pkg = {}
def getpkgvalue(pkgdict, key, pkgname, defaultval = None):
value = pkgdict.get('%s_%s' % (key, pkgname), None)
if not value:
value = pkgdict.get(key, defaultval)
return value
for pkginfo in pkginfolist: for pkginfo in pkginfolist:
pn = pkginfo['PN'] pn = pkginfo['PN']
pv = pkginfo['PV'] pv = pkginfo['PV']
@@ -157,25 +163,24 @@ class PackageListModel(gtk.TreeStore):
self.COL_INC, False) self.COL_INC, False)
self.pn_path[pn] = self.get_path(pniter) self.pn_path[pn] = self.get_path(pniter)
# PKG is always present
pkg = pkginfo['PKG'] pkg = pkginfo['PKG']
pkgv = pkginfo['PKGV'] pkgv = getpkgvalue(pkginfo, 'PKGV', pkg)
pkgr = pkginfo['PKGR'] pkgr = getpkgvalue(pkginfo, 'PKGR', pkg)
pkgsize = pkginfo['PKGSIZE_%s' % pkg] if 'PKGSIZE_%s' % pkg in pkginfo.keys() else "0" # PKGSIZE is artificial, will always be overridden with the package name if present
pkg_rename = pkginfo['PKG_%s' % pkg] if 'PKG_%s' % pkg in pkginfo.keys() else "" pkgsize = pkginfo.get('PKGSIZE_%s' % pkg, "0")
section = pkginfo['SECTION_%s' % pkg] if 'SECTION_%s' % pkg in pkginfo.keys() else "" # PKG_%s is the renamed version
summary = pkginfo['SUMMARY_%s' % pkg] if 'SUMMARY_%s' % pkg in pkginfo.keys() else "" pkg_rename = pkginfo.get('PKG_%s' % pkg, "")
rdep = pkginfo['RDEPENDS_%s' % pkg] if 'RDEPENDS_%s' % pkg in pkginfo.keys() else "" # The rest may be overridden or not
rrec = pkginfo['RRECOMMENDS_%s' % pkg] if 'RRECOMMENDS_%s' % pkg in pkginfo.keys() else "" section = getpkgvalue(pkginfo, 'SECTION', pkg, "")
rprov = pkginfo['RPROVIDES_%s' % pkg] if 'RPROVIDES_%s' % pkg in pkginfo.keys() else "" summary = getpkgvalue(pkginfo, 'SUMMARY', pkg, "")
rdep = getpkgvalue(pkginfo, 'RDEPENDS', pkg, "")
rrec = getpkgvalue(pkginfo, 'RRECOMMENDS', pkg, "")
rprov = getpkgvalue(pkginfo, 'RPROVIDES', pkg, "")
for i in rprov.split(): for i in rprov.split():
self.rprov_pkg[i] = pkg self.rprov_pkg[i] = pkg
if 'ALLOW_EMPTY_%s' % pkg in pkginfo.keys(): allow_empty = getpkgvalue(pkginfo, 'ALLOW_EMPTY', pkg, "")
allow_empty = pkginfo['ALLOW_EMPTY_%s' % pkg]
elif 'ALLOW_EMPTY' in pkginfo.keys():
allow_empty = pkginfo['ALLOW_EMPTY']
else:
allow_empty = ""
if pkgsize == "0" and not allow_empty: if pkgsize == "0" and not allow_empty:
continue continue