diff options
author | Shane Wang <shane.wang@intel.com> | 2012-04-02 16:29:17 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-04-05 18:48:07 +0100 |
commit | 5cad18b188cf51e31b9ae1ab5a1fd35eacf22d43 (patch) | |
tree | 11a8eb051bc869d455fc78bd11c51726f65d2f54 /bitbake/lib/bb/ui/crumbs/imagedetailspage.py | |
parent | b9accbb42a40e1ace0f9790a20712b821bb2b3f6 (diff) | |
download | poky-5cad18b188cf51e31b9ae1ab5a1fd35eacf22d43.tar.gz |
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 <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/ui/crumbs/imagedetailspage.py')
-rwxr-xr-x | bitbake/lib/bb/ui/crumbs/imagedetailspage.py | 11 |
1 files changed, 1 insertions, 10 deletions
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): | |||
151 | for child in children: | 151 | for child in children: |
152 | self.box_group_area.remove(child) | 152 | self.box_group_area.remove(child) |
153 | 153 | ||
154 | def _size_to_string(self, size): | ||
155 | if len(str(int(size))) > 6: | ||
156 | size_str = '%.1f' % (size*1.0/(1024*1024)) + ' MB' | ||
157 | elif len(str(int(size))) > 3: | ||
158 | size_str = '%.1f' % (size*1.0/1024) + ' KB' | ||
159 | else: | ||
160 | size_str = str(size) + ' B' | ||
161 | return size_str | ||
162 | |||
163 | def show_page(self, step): | 154 | def show_page(self, step): |
164 | build_succeeded = (step == self.builder.IMAGE_GENERATED) | 155 | build_succeeded = (step == self.builder.IMAGE_GENERATED) |
165 | image_addr = self.builder.parameters.image_addr | 156 | image_addr = self.builder.parameters.image_addr |
@@ -200,7 +191,7 @@ class ImageDetailsPage (HobPage): | |||
200 | default_toggled = False | 191 | default_toggled = False |
201 | default_image_size = 0 | 192 | default_image_size = 0 |
202 | for image_name in image_names: | 193 | for image_name in image_names: |
203 | image_size = self._size_to_string(os.stat(os.path.join(image_addr, image_name)).st_size) | 194 | image_size = HobPage._size_to_string(os.stat(os.path.join(image_addr, image_name)).st_size) |
204 | if not default_toggled: | 195 | if not default_toggled: |
205 | default_toggled = (self.test_type_runnable(image_name) and self.test_mach_runnable(image_name)) \ | 196 | default_toggled = (self.test_type_runnable(image_name) and self.test_mach_runnable(image_name)) \ |
206 | or self.test_deployable(image_name) | 197 | or self.test_deployable(image_name) |