diff options
| author |   Ed Bartosh <ed.bartosh@linux.intel.com> | 2015-08-20 14:10:29 +0300 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-08-30 12:34:35 +0100 |
| commit | d401a8518fb4b0e8adeb34be8948fa780299870c (patch) | |
| tree | 57a9d3241abbc29f0ddbfdb257f90449016eb3ff /scripts | |
| parent | 94c85fdaec36bfda509be4a66082a0156bf76695 (diff) | |
| download | openembedded-core-contrib-d401a8518fb4b0e8adeb34be8948fa780299870c.tar.gz | |
wic: deferred call of hlp.get_wic_plugins_help()
If get_wic_plugins_help is called from wic main module
it calls git_bitbake_var at some point. This fails when
wic is called from bitbake as 'bitbake -e' can't be
run.
Moved call of this method to help.py in order to call it
later, when BitbakeVariables singleton is properly initialized
to get variables from .env files.
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/lib/image/help.py | 2 | ||||
| -rwxr-xr-x | scripts/wic | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/scripts/lib/image/help.py b/scripts/lib/image/help.py index dc6ff36610..717d84755f 100644 --- a/scripts/lib/image/help.py +++ b/scripts/lib/image/help.py @@ -42,6 +42,8 @@ def display_help(subcommand, subcommands): return False hlp = subcommands.get(subcommand, subcommand_error)[2] + if callable(hlp): + hlp = hlp() pager = subprocess.Popen('less', stdin=subprocess.PIPE) pager.communicate(hlp) diff --git a/scripts/wic b/scripts/wic index c1d3003378..5aa2393cf9 100755 --- a/scripts/wic +++ b/scripts/wic @@ -280,7 +280,7 @@ subcommands = { hlp.wic_list_help], "plugins": [wic_help_topic_subcommand, wic_help_topic_usage, - hlp.get_wic_plugins_help()], + hlp.get_wic_plugins_help], "overview": [wic_help_topic_subcommand, wic_help_topic_usage, hlp.wic_overview_help], |