summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2015-06-29 13:30:36 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-07-02 23:01:46 +0100
commit98912687f15f6d7537746fb38499f739e1a47be9 (patch)
treef704bd27c26dbe197db880a07cb2c40ffd229f4d
parentf7059362053c87f96ce68d1ab850962defb76540 (diff)
downloadopenembedded-core-contrib-98912687f15f6d7537746fb38499f739e1a47be9.tar.gz
openembedded-core-contrib-98912687f15f6d7537746fb38499f739e1a47be9.tar.bz2
openembedded-core-contrib-98912687f15f6d7537746fb38499f739e1a47be9.zip
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 <ed.bartosh@linux.intel.com>
-rwxr-xr-xscripts/wic19
1 files 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