summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCristiana Voicu <cristiana.voicu@intel.com>2013-10-28 15:30:21 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-11-01 17:59:31 +0000
commitf3541226b8b1187e79dec0f6f9f3c58cedf9ac9b (patch)
treec9bc90f3d035c9ff3f529d975477d671a0935d6b
parent1c7bbf8deceed6ffd572fb565de3dc1e3c3ef032 (diff)
downloadpoky-f3541226b8b1187e79dec0f6f9f3c58cedf9ac9b.tar.gz
bitbake: hob: do not display the "Package list may be incomplete!" dialog
This dialog is not needed. Instead "Edit packages" button should redirect to Packages list. [YOCTO #5257] (Bitbake rev: aa2e86a2ac28414f6d25fcd541a6ed2b50f15a2c) Signed-off-by: Cristiana Voicu <cristiana.voicu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-xbitbake/lib/bb/ui/crumbs/builddetailspage.py2
-rwxr-xr-xbitbake/lib/bb/ui/crumbs/builder.py21
-rwxr-xr-xbitbake/lib/bb/ui/crumbs/imagedetailspage.py2
3 files changed, 4 insertions, 21 deletions
diff --git a/bitbake/lib/bb/ui/crumbs/builddetailspage.py b/bitbake/lib/bb/ui/crumbs/builddetailspage.py
index 171a7a68ed..1899956469 100755
--- a/bitbake/lib/bb/ui/crumbs/builddetailspage.py
+++ b/bitbake/lib/bb/ui/crumbs/builddetailspage.py
@@ -423,7 +423,7 @@ class BuildDetailsPage (HobPage):
423 if "recipes" in action: 423 if "recipes" in action:
424 self.builder.show_recipes() 424 self.builder.show_recipes()
425 elif "packages" in action: 425 elif "packages" in action:
426 self.builder.show_packages(ask=False) 426 self.builder.show_packages()
427 elif "image" in action: 427 elif "image" in action:
428 self.builder.show_configuration() 428 self.builder.show_configuration()
429 429
diff --git a/bitbake/lib/bb/ui/crumbs/builder.py b/bitbake/lib/bb/ui/crumbs/builder.py
index ab6750b741..de1458cbc4 100755
--- a/bitbake/lib/bb/ui/crumbs/builder.py
+++ b/bitbake/lib/bb/ui/crumbs/builder.py
@@ -1384,25 +1384,8 @@ class Builder(gtk.Window):
1384 dialog.run() 1384 dialog.run()
1385 dialog.destroy() 1385 dialog.destroy()
1386 1386
1387 def show_packages(self, ask=True): 1387 def show_packages(self):
1388 _, selected_recipes = self.recipe_model.get_selected_recipes() 1388 self.switch_page(self.PACKAGE_SELECTION)
1389 if selected_recipes and ask:
1390 lbl = "<b>Package list may be incomplete!</b>\nDo you want to build selected recipes"
1391 lbl = lbl + " to get a full list or just view the existing packages?"
1392 dialog = CrumbsMessageDialog(self, lbl, gtk.STOCK_DIALOG_INFO)
1393 button = dialog.add_button("View packages", gtk.RESPONSE_NO)
1394 HobAltButton.style_button(button)
1395 button = dialog.add_button("Build packages", gtk.RESPONSE_YES)
1396 HobButton.style_button(button)
1397 dialog.set_default_response(gtk.RESPONSE_YES)
1398 response = dialog.run()
1399 dialog.destroy()
1400 if response == gtk.RESPONSE_YES:
1401 self.generate_packages_async(True)
1402 else:
1403 self.switch_page(self.PACKAGE_SELECTION)
1404 else:
1405 self.switch_page(self.PACKAGE_SELECTION)
1406 1389
1407 def show_recipes(self): 1390 def show_recipes(self):
1408 self.switch_page(self.RECIPE_SELECTION) 1391 self.switch_page(self.RECIPE_SELECTION)
diff --git a/bitbake/lib/bb/ui/crumbs/imagedetailspage.py b/bitbake/lib/bb/ui/crumbs/imagedetailspage.py
index b5d9660218..4c862474e9 100755
--- a/bitbake/lib/bb/ui/crumbs/imagedetailspage.py
+++ b/bitbake/lib/bb/ui/crumbs/imagedetailspage.py
@@ -655,7 +655,7 @@ class ImageDetailsPage (HobPage):
655 self.builder.show_configuration() 655 self.builder.show_configuration()
656 656
657 def edit_packages_button_clicked_cb(self, button): 657 def edit_packages_button_clicked_cb(self, button):
658 self.builder.show_packages(ask=False) 658 self.builder.show_packages()
659 659
660 def my_images_button_clicked_cb(self, button): 660 def my_images_button_clicked_cb(self, button):
661 self.builder.show_load_my_images_dialog() 661 self.builder.show_load_my_images_dialog()