diff options
| author | Tom Zanussi <tom.zanussi@linux.intel.com> | 2014-03-28 16:49:02 -0500 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-03-30 09:53:42 +0100 |
| commit | a17f879cd5bc7401597ccee908801f8e3efa34c0 (patch) | |
| tree | 92dcd72ceb87014cef9a52f289f0a167be080694 | |
| parent | a56ad23ecf3fbb6d3085a856622e2c5f0018934b (diff) | |
| download | openembedded-core-a17f879cd5bc7401597ccee908801f8e3efa34c0.tar.gz openembedded-core-a17f879cd5bc7401597ccee908801f8e3efa34c0.tar.bz2 openembedded-core-a17f879cd5bc7401597ccee908801f8e3efa34c0.zip | |
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@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | scripts/lib/image/engine.py | 5 |
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): 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 |