[oe-commits] Tom Zanussi : wic: Fix bitbake_env_command for 'None' case

[git at git.openembedded.org]

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

Author: Tom Zanussi <tom.zanussi at linux.intel.com>
Date:   Fri Mar 28 16:49:02 2014 -0500

wic: Fix bitbake_env_command for 'None' case

bitbake_env_command will choke if it isn't given an image, make sure
it does the right thing in that case.

Signed-off-by: Tom Zanussi <tom.zanussi at linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 scripts/lib/image/engine.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/scripts/lib/image/engine.py b/scripts/lib/image/engine.py
index 6cf6169..0643780 100644
--- a/scripts/lib/image/engine.py
+++ b/scripts/lib/image/engine.py
@@ -65,7 +65,10 @@ def find_bitbake_env_lines(image_name):
     If image_name is empty, plugins might still be able to use the
     environment, so set it regardless.
     """
-    bitbake_env_cmd = "bitbake -e %s" % image_name
+    if image_name:
+        bitbake_env_cmd = "bitbake -e %s" % image_name
+    else:
+        bitbake_env_cmd = "bitbake -e"
     rc, bitbake_env_lines = exec_cmd(bitbake_env_cmd)
     if rc != 0:
         print "Couldn't get '%s' output." % bitbake_env_cmd