Hob: Bug fix for image details page
Hi Richard,
This pull request contains bug fix for image details page in Hob.
Please help to review and pull.
Thanks,
Dongxiao
The following changes since commit cb07a027d3366ed30b0f7e5e85d08c6fda4eb5b9:
Hob: add exception handling (2012-04-15 17:29:50 +0100)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib dxu4/hob-bugfix
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=dxu4/hob-bugfix
Dongxiao Xu (1):
Hob: Fix contents in imagedetailsscreen
lib/bb/ui/crumbs/builder.py | 9 +++++---- lib/bb/ui/crumbs/hig.py | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-)
Signature · 1 line
1.7.4.1
PATCH 1/1 Hob: Fix contents in imagedetailsscreen
This commit fixes the contents in imagedetailsscreen, which lacks some kind of image types, e.x., iso and hddimg.
Signed-off-by Dongxiao Xu <[email protected]>
--- lib/bb/ui/crumbs/builder.py | 9 +++++---- lib/bb/ui/crumbs/hig.py | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-)
lib/bb/ui/crumbs/builder.py +5 -4
@@ -32,7 +32,7 @@ from bb.ui.crumbs.recipeselectionpage import RecipeSelectionPage from bb.ui.crumbs.packageselectionpage import PackageSelectionPage from bb.ui.crumbs.builddetailspage import BuildDetailsPage from bb.ui.crumbs.imagedetailspage import ImageDetailsPage -from bb.ui.crumbs.hobwidget import hwc, HobButton, HobAltButton +from bb.ui.crumbs.hobwidget import hwc, HobButton, HobAltButton, hcc from bb.ui.crumbs.hig import CrumbsMessageDialog, ImageSelectionDialog, \ AdvancedSettingDialog, LayerSelectionDialog, \ DeployImageDialog
@@ -752,9 +752,10 @@ class Builder(gtk.Window): else: linkname = selected_image + '-' + self.configuration.curr_mach for image_type in self.parameters.image_types: - linkpath = self.parameters.image_addr + '/' + linkname + '.' + image_type - if os.path.exists(linkpath): - self.parameters.image_names.append(os.readlink(linkpath)) + for real_image_type in hcc.SUPPORTED_IMAGE_TYPES[image_type]: + linkpath = self.parameters.image_addr + '/' + linkname + '.' + real_image_type + if os.path.exists(linkpath): + self.parameters.image_names.append(os.readlink(linkpath)) elif self.current_step == self.PACKAGE_GENERATING: fraction = 1.0 self.build_details_page.update_progress_bar("Build Completed: ", fraction)
lib/bb/ui/crumbs/hig.py +1 -1
@@ -1107,7 +1107,7 @@ class ImageSelectionDialog (CrumbsDialog): for image_type in self.image_types: for real_image_type in hcc.SUPPORTED_IMAGE_TYPES[image_type]: if f.endswith('.' + real_image_type): - imageset.add(f.rsplit('.' + real_image_type)[0]) + imageset.add(f.rsplit('.' + real_image_type)[0].rsplit('.rootfs')[0]) self.image_list.append(f) for image in imageset:
Signature · 1 line
1.7.4.1