From 8a02406f1c1fa76bd43372a0f1936d0ebf71e668 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Mon, 2 Dec 2013 18:58:45 +0000 Subject: bitbake: lib/bb/ui: handle PKGSIZE change to bytes PKGSIZE is now in bytes in pkgdata, so we need to treat it as such in the UI code for Hob / Toaster. (Bitbake rev: 3b5ff814cd4a3efa4b17c6b343ec39c9acca5c9e) Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- bitbake/lib/bb/ui/buildinfohelper.py | 2 +- bitbake/lib/bb/ui/crumbs/hoblistmodel.py | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/bitbake/lib/bb/ui/buildinfohelper.py b/bitbake/lib/bb/ui/buildinfohelper.py index 2c9d77abb3..61149fafd7 100644 --- a/bitbake/lib/bb/ui/buildinfohelper.py +++ b/bitbake/lib/bb/ui/buildinfohelper.py @@ -188,7 +188,7 @@ class ORMWrapper(object): revision = package_info['PKGR'], summary = package_info['SUMMARY'], description = package_info['DESCRIPTION'], - size = int(package_info['PKGSIZE']) * 1024, + size = int(package_info['PKGSIZE']), section = package_info['SECTION'], license = package_info['LICENSE'], ) diff --git a/bitbake/lib/bb/ui/crumbs/hoblistmodel.py b/bitbake/lib/bb/ui/crumbs/hoblistmodel.py index 79e909c7f1..cffe6e14b4 100644 --- a/bitbake/lib/bb/ui/crumbs/hoblistmodel.py +++ b/bitbake/lib/bb/ui/crumbs/hoblistmodel.py @@ -251,7 +251,7 @@ class PackageListModel(gtk.ListStore): pkgv = getpkgvalue(pkginfo, 'PKGV', pkg) pkgr = getpkgvalue(pkginfo, 'PKGR', pkg) # PKGSIZE is artificial, will always be overridden with the package name if present - pkgsize = pkginfo.get('PKGSIZE_%s' % pkg, "0") + pkgsize = int(pkginfo.get('PKGSIZE_%s' % pkg, "0")) # PKG_%s is the renamed version pkg_rename = pkginfo.get('PKG_%s' % pkg, "") # The rest may be overridden or not @@ -268,11 +268,10 @@ class PackageListModel(gtk.ListStore): allow_empty = getpkgvalue(pkginfo, 'ALLOW_EMPTY', pkg, "") - if pkgsize == "0" and not allow_empty: + if pkgsize == 0 and not allow_empty: continue - # pkgsize is in KB - size = HobPage._size_to_string(HobPage._string_to_size(pkgsize + ' KB')) + size = HobPage._size_to_string(pkgsize) self.set(self.append(), self.COL_NAME, pkg, self.COL_VER, pkgv, self.COL_REV, pkgr, self.COL_RNM, pkg_rename, self.COL_SEC, section, self.COL_SUM, summary, -- cgit v1.2.3-54-g00ecf