From 5cad18b188cf51e31b9ae1ab5a1fd35eacf22d43 Mon Sep 17 00:00:00 2001 From: Shane Wang Date: Mon, 2 Apr 2012 16:29:17 +0800 Subject: Hob: unify _size_to_string() and _string_to_size() We call intsize_to_string (and string_to_intsize) in 3 different places. We unify the implementations into one place. (Bitbake rev: 578ce86a9ac2110f5b128aae582c6e0b3e739cec) Signed-off-by: Shane Wang Signed-off-by: Richard Purdie --- bitbake/lib/bb/ui/crumbs/imagedetailspage.py | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'bitbake/lib/bb/ui/crumbs/imagedetailspage.py') diff --git a/bitbake/lib/bb/ui/crumbs/imagedetailspage.py b/bitbake/lib/bb/ui/crumbs/imagedetailspage.py index 5a6324d2a4..b685d11e69 100755 --- a/bitbake/lib/bb/ui/crumbs/imagedetailspage.py +++ b/bitbake/lib/bb/ui/crumbs/imagedetailspage.py @@ -151,15 +151,6 @@ class ImageDetailsPage (HobPage): for child in children: self.box_group_area.remove(child) - def _size_to_string(self, size): - if len(str(int(size))) > 6: - size_str = '%.1f' % (size*1.0/(1024*1024)) + ' MB' - elif len(str(int(size))) > 3: - size_str = '%.1f' % (size*1.0/1024) + ' KB' - else: - size_str = str(size) + ' B' - return size_str - def show_page(self, step): build_succeeded = (step == self.builder.IMAGE_GENERATED) image_addr = self.builder.parameters.image_addr @@ -200,7 +191,7 @@ class ImageDetailsPage (HobPage): default_toggled = False default_image_size = 0 for image_name in image_names: - image_size = self._size_to_string(os.stat(os.path.join(image_addr, image_name)).st_size) + image_size = HobPage._size_to_string(os.stat(os.path.join(image_addr, image_name)).st_size) if not default_toggled: default_toggled = (self.test_type_runnable(image_name) and self.test_mach_runnable(image_name)) \ or self.test_deployable(image_name) -- cgit v1.2.3-54-g00ecf