diff options
author | Joshua Lock <josh@linux.intel.com> | 2011-09-02 16:53:32 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-09-05 20:25:42 +0100 |
commit | 09d78741ea550b70472535ecb66b29559a4cd8b9 (patch) | |
tree | e5d76313dea259fce6dfdb16b6843b6bbabc166d /bitbake/lib/bb | |
parent | 38653d64d2580fbe99441cf12b5abca6e563c621 (diff) | |
download | poky-09d78741ea550b70472535ecb66b29559a4cd8b9.tar.gz |
hob: disable removal of packages
It's felt that the stability of package deselection is not sufficient for
the upcoming release and thus package removal should be disabled.
I'd actually like to see this patch, or its effects, reverted as soon as
the release bits have been frozen so that this issue can continue to be
worked on.
(Bitbake rev: 73b6ff4654d10baae59d83e8568d58d989e99dd7)
Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb')
-rw-r--r-- | bitbake/lib/bb/ui/hob.py | 42 |
1 files changed, 24 insertions, 18 deletions
diff --git a/bitbake/lib/bb/ui/hob.py b/bitbake/lib/bb/ui/hob.py index 3b0cacca49..76b03cdac6 100644 --- a/bitbake/lib/bb/ui/hob.py +++ b/bitbake/lib/bb/ui/hob.py | |||
@@ -544,14 +544,17 @@ class MainWindow (gtk.Window): | |||
544 | """ | 544 | """ |
545 | # Whether the item is currently included | 545 | # Whether the item is currently included |
546 | inc = self.model[opath][self.model.COL_INC] | 546 | inc = self.model[opath][self.model.COL_INC] |
547 | # FIXME: due to inpredictability of the removal of packages we are | ||
548 | # temporarily disabling this feature | ||
547 | # If the item is already included, mark it for removal then | 549 | # If the item is already included, mark it for removal then |
548 | # the sweep_up() method finds affected items and marks them | 550 | # the sweep_up() method finds affected items and marks them |
549 | # appropriately | 551 | # appropriately |
550 | if inc: | 552 | # if inc: |
551 | self.model.mark(opath) | 553 | # self.model.mark(opath) |
552 | self.model.sweep_up() | 554 | # self.model.sweep_up() |
553 | # If the item isn't included, mark it for inclusion | 555 | # # If the item isn't included, mark it for inclusion |
554 | else: | 556 | # else: |
557 | if not inc: | ||
555 | self.model.include_item(item_path=opath, | 558 | self.model.include_item(item_path=opath, |
556 | binb="User Selected", | 559 | binb="User Selected", |
557 | image_contents=image) | 560 | image_contents=image) |
@@ -563,19 +566,22 @@ class MainWindow (gtk.Window): | |||
563 | inc = model[path][self.model.COL_INC] | 566 | inc = model[path][self.model.COL_INC] |
564 | # Warn user before removing included packages | 567 | # Warn user before removing included packages |
565 | if inc: | 568 | if inc: |
566 | pn = model[path][self.model.COL_NAME] | 569 | # FIXME: due to inpredictability of the removal of packages we are |
567 | revdeps = self.model.find_reverse_depends(pn) | 570 | # temporarily disabling this feature |
568 | if len(revdeps): | 571 | return |
569 | lbl = "<b>Remove %s?</b>\n\nThis action cannot be undone and all packages which depend on this will be removed\nPackages which depend on %s include %s." % (pn, pn, ", ".join(revdeps).rstrip(",")) | 572 | # pn = model[path][self.model.COL_NAME] |
570 | else: | 573 | # revdeps = self.model.find_reverse_depends(pn) |
571 | lbl = "<b>Remove %s?</b>\n\nThis action cannot be undone." % pn | 574 | # if len(revdeps): |
572 | dialog = CrumbsDialog(self, lbl, gtk.STOCK_DIALOG_WARNING) | 575 | # lbl = "<b>Remove %s?</b>\n\nThis action cannot be undone and all packages which depend on this will be removed\nPackages which depend on %s include %s." % (pn, pn, ", ".join(revdeps).rstrip(",")) |
573 | dialog.add_button(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL) | 576 | # else: |
574 | dialog.add_button("Remove", gtk.RESPONSE_OK) | 577 | # lbl = "<b>Remove %s?</b>\n\nThis action cannot be undone." % pn |
575 | response = dialog.run() | 578 | # dialog = CrumbsDialog(self, lbl, gtk.STOCK_DIALOG_WARNING) |
576 | dialog.destroy() | 579 | # dialog.add_button(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL) |
577 | if response == gtk.RESPONSE_CANCEL: | 580 | # dialog.add_button("Remove", gtk.RESPONSE_OK) |
578 | return | 581 | # response = dialog.run() |
582 | # dialog.destroy() | ||
583 | # if response == gtk.RESPONSE_CANCEL: | ||
584 | # return | ||
579 | 585 | ||
580 | self.set_busy_cursor() | 586 | self.set_busy_cursor() |
581 | # Convert path to path in original model | 587 | # Convert path to path in original model |