From: Tom Zanussi Date: Fri, 28 Mar 2014 21:49:02 +0000 (-0500) Subject: wic: Fix bitbake_env_command for 'None' case X-Git-Tag: 2015-4~3187 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=a17f879cd5bc7401597ccee908801f8e3efa34c0;p=openembedded-core.git 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 Signed-off-by: Richard Purdie --- diff --git a/scripts/lib/image/engine.py b/scripts/lib/image/engine.py index 6cf6169482..0643780f1a 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