From 98912687f15f6d7537746fb38499f739e1a47be9 Mon Sep 17 00:00:00 2001 From: Ed Bartosh Date: Mon, 29 Jun 2015 13:30:36 +0300 Subject: wic: Fix confusing error message Wic throws this message when any of the build artifacts are not provided: Build artifacts not completely specified, exiting. (Use 'wic -e' or 'wic -r -b -k -n' to specify artifacts) It was not clear which artifact was not specified. Reworked the code to specify list of missed artifacts. Now the message looks like this: The following build artifacts are not specified: bootimg-dir, kernel-dir, native-sysroot [YOCTO #7912] Signed-off-by: Ed Bartosh --- scripts/wic | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/scripts/wic b/scripts/wic index b75d122482..ac272c62f7 100755 --- a/scripts/wic +++ b/scripts/wic @@ -122,13 +122,18 @@ def wic_create_subcommand(args, usage_str): logging.error("Can't build roofs as bitbake is not in the $PATH") sys.exit(1) - if not options.image_name and not (options.rootfs_dir and - options.bootimg_dir and - options.kernel_dir and - options.native_sysroot): - print "Build artifacts not completely specified, exiting." - print " (Use 'wic -e' or 'wic -r -b -k -n' to specify artifacts)" - sys.exit(1) + if not options.image_name: + missed = [] + for val, opt in [(options.rootfs_dir, 'rootfs-dir'), + (options.bootimg_dir, 'bootimg-dir'), + (options.kernel_dir, 'kernel-dir'), + (options.native_sysroot, 'native-sysroot')]: + if not val: + missed.append(opt) + if missed: + print "The following build artifacts are not specified:" + print " " + ", ".join(missed) + sys.exit(1) if not options.image_name: options.build_check = False -- cgit 1.2.3-korg