summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2015-01-27 10:02:38 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-02-03 14:53:40 +0000
commitf38c35b925d6eab0d5a41b8592b0eb8b0a3b7b72 (patch)
tree40edf5d8a7613b47cb54d8f3dae64d0f017e3c20
parentb198a189228648057c3be7d068598f50841b3bf9 (diff)
downloadopenembedded-core-contrib-f38c35b925d6eab0d5a41b8592b0eb8b0a3b7b72.tar.gz
openembedded-core-contrib-f38c35b925d6eab0d5a41b8592b0eb8b0a3b7b72.tar.bz2
openembedded-core-contrib-f38c35b925d6eab0d5a41b8592b0eb8b0a3b7b72.zip
lib/oe/image.py: add error checking for missing IMAGE_CMD
An invalid value in IMAGE_FSTYPES was triggering a traceback. Add a check and a reasonable error message instead. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
-rw-r--r--meta/lib/oe/image.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/meta/lib/oe/image.py b/meta/lib/oe/image.py
index f9c8f84cf8..0ce303d570 100644
--- a/meta/lib/oe/image.py
+++ b/meta/lib/oe/image.py
@@ -296,7 +296,11 @@ class Image(ImageDepGraph):
bb.data.update_data(localdata)
localdata.setVar('type', type)
- cmds.append("\t" + localdata.getVar("IMAGE_CMD", True))
+ image_cmd = localdata.getVar("IMAGE_CMD", True)
+ if image_cmd:
+ cmds.append("\t" + image_cmd)
+ else:
+ bb.fatal("No IMAGE_CMD defined for IMAGE_FSTYPES entry '%s' - possibly invalid type name or missing support class" % type)
cmds.append(localdata.expand("\tcd ${DEPLOY_DIR_IMAGE}"))
if type in cimages: