[oe-commits] Ed Bartosh : wic: deferred call of hlp.get_wic_plugins_help()

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: d401a8518fb4b0e8adeb34be8948fa780299870c
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=d401a8518fb4b0e8adeb34be8948fa780299870c

Author: Ed Bartosh <ed.bartosh at linux.intel.com>
Date:   Thu Aug 20 14:10:29 2015 +0300

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 at linux.intel.com>

Signed-off-by: Ross Burton <ross.burton at intel.com>

---

 scripts/lib/image/help.py | 2 ++
 scripts/wic               | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/scripts/lib/image/help.py b/scripts/lib/image/help.py
index dc6ff36..717d847 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 c1d3003..5aa2393 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],