summaryrefslogtreecommitdiffstats
path: root/scripts/lib/image/engine.py
diff options
context:
space:
mode:
authorTom Zanussi <tom.zanussi@linux.intel.com>2014-03-28 16:49:02 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-03-30 10:10:34 +0100
commit7cb65151f83e45a698f5e28e77fc6d7f382d8aee (patch)
tree8e7893c9f9efe22b81e4deb9864caf3c330ebdf5 /scripts/lib/image/engine.py
parentb8fd50e9df5aa5bd3cbe368ebf0adc583e1f2ff2 (diff)
downloadpoky-7cb65151f83e45a698f5e28e77fc6d7f382d8aee.tar.gz
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. (From OE-Core rev: a17f879cd5bc7401597ccee908801f8e3efa34c0) Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib/image/engine.py')
-rw-r--r--scripts/lib/image/engine.py5
1 files changed, 4 insertions, 1 deletions
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):
65 If image_name is empty, plugins might still be able to use the 65 If image_name is empty, plugins might still be able to use the
66 environment, so set it regardless. 66 environment, so set it regardless.
67 """ 67 """
68 bitbake_env_cmd = "bitbake -e %s" % image_name 68 if image_name:
69 bitbake_env_cmd = "bitbake -e %s" % image_name
70 else:
71 bitbake_env_cmd = "bitbake -e"
69 rc, bitbake_env_lines = exec_cmd(bitbake_env_cmd) 72 rc, bitbake_env_lines = exec_cmd(bitbake_env_cmd)
70 if rc != 0: 73 if rc != 0:
71 print "Couldn't get '%s' output." % bitbake_env_cmd 74 print "Couldn't get '%s' output." % bitbake_env_cmd