[bitbake-devel] [PATCH 1/3] lib/bb/ui: handle PKGSIZE change to bytes
Paul Eggleton
paul.eggleton at linux.intel.com
Mon Dec 2 18:58:45 UTC 2013
PKGSIZE is now in bytes in pkgdata, so we need to treat it as such in
the UI code for Hob / Toaster.
Signed-off-by: Paul Eggleton <paul.eggleton at linux.intel.com>
---
lib/bb/ui/buildinfohelper.py | 2 +-
lib/bb/ui/crumbs/hoblistmodel.py | 7 +++----
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/lib/bb/ui/buildinfohelper.py b/lib/bb/ui/buildinfohelper.py
index 2c9d77a..61149fa 100644
--- a/lib/bb/ui/buildinfohelper.py
+++ b/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/lib/bb/ui/crumbs/hoblistmodel.py b/lib/bb/ui/crumbs/hoblistmodel.py
index 79e909c..cffe6e1 100644
--- a/lib/bb/ui/crumbs/hoblistmodel.py
+++ b/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,
--
1.8.1.2
More information about the bitbake-devel
mailing list