diff options
author | Dongxiao Xu <dongxiao.xu@intel.com> | 2012-04-24 16:16:12 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-04-24 10:14:48 +0100 |
commit | 2a6e1b0a0ccd11806723be7d9959c387f5ecbe17 (patch) | |
tree | 088364bd4ce625341fa12ef665d024b2dd3559c7 /bitbake/lib/bb/ui/crumbs/builder.py | |
parent | 544553b12b3ca111abd555f84eab1e68f648b829 (diff) | |
download | poky-2a6e1b0a0ccd11806723be7d9959c387f5ecbe17.tar.gz |
Hob: Issue sanity check after parse is completed
In original scheme, sanity check is part of the parsing process. If a
sanity check fails, it means the parsing is failed and values in Hob
GUI may not correct.
With this commit, Hob will actively issue sanity_check() after the
parsing is completed.
This fixes [YOCTO #2361]
(Bitbake rev: 36968815dcc91759eeacb308bf4b294af416eee5)
Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/ui/crumbs/builder.py')
-rwxr-xr-x | bitbake/lib/bb/ui/crumbs/builder.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/bitbake/lib/bb/ui/crumbs/builder.py b/bitbake/lib/bb/ui/crumbs/builder.py index cbcb3f1965..4b274a75a1 100755 --- a/bitbake/lib/bb/ui/crumbs/builder.py +++ b/bitbake/lib/bb/ui/crumbs/builder.py | |||
@@ -405,6 +405,9 @@ class Builder(gtk.Window): | |||
405 | self.set_user_config() | 405 | self.set_user_config() |
406 | self.handler.generate_configuration() | 406 | self.handler.generate_configuration() |
407 | 407 | ||
408 | def sanity_check(self): | ||
409 | self.handler.trigger_sanity_check() | ||
410 | |||
408 | def populate_recipe_package_info_async(self): | 411 | def populate_recipe_package_info_async(self): |
409 | self.switch_page(self.RCPPKGINFO_POPULATING) | 412 | self.switch_page(self.RCPPKGINFO_POPULATING) |
410 | # Parse recipes | 413 | # Parse recipes |
@@ -557,8 +560,6 @@ class Builder(gtk.Window): | |||
557 | self.handler.init_cooker() | 560 | self.handler.init_cooker() |
558 | # set bb layers | 561 | # set bb layers |
559 | self.handler.set_bblayers(self.configuration.layers) | 562 | self.handler.set_bblayers(self.configuration.layers) |
560 | # Re-enable sanity checks | ||
561 | self.handler.enable_sanity() | ||
562 | # set local configuration | 563 | # set local configuration |
563 | self.handler.set_machine(self.configuration.curr_mach) | 564 | self.handler.set_machine(self.configuration.curr_mach) |
564 | self.handler.set_package_format(self.configuration.curr_package_format) | 565 | self.handler.set_package_format(self.configuration.curr_package_format) |
@@ -620,6 +621,8 @@ class Builder(gtk.Window): | |||
620 | def handler_command_succeeded_cb(self, handler, initcmd): | 621 | def handler_command_succeeded_cb(self, handler, initcmd): |
621 | if initcmd == self.handler.GENERATE_CONFIGURATION: | 622 | if initcmd == self.handler.GENERATE_CONFIGURATION: |
622 | self.update_configuration_parameters(self.get_parameters_sync()) | 623 | self.update_configuration_parameters(self.get_parameters_sync()) |
624 | self.sanity_check() | ||
625 | elif initcmd == self.handler.SANITY_CHECK: | ||
623 | self.image_configuration_page.switch_machine_combo() | 626 | self.image_configuration_page.switch_machine_combo() |
624 | elif initcmd in [self.handler.GENERATE_RECIPES, | 627 | elif initcmd in [self.handler.GENERATE_RECIPES, |
625 | self.handler.GENERATE_PACKAGES, | 628 | self.handler.GENERATE_PACKAGES, |