From 7a5156092699593903a4bedb4cb23cc6e42ea62e Mon Sep 17 00:00:00 2001 From: Ed Bartosh Date: Tue, 21 Feb 2017 17:12:35 +0200 Subject: wic: raise WicError instead of calling logger.error Replaced forgotten calls of logger.error with raising WicError exception. Otherwise errors will be ignored. Signed-off-by: Ed Bartosh --- scripts/lib/wic/plugins/source/bootimg-pcbios.py | 4 ++-- scripts/lib/wic/utils/misc.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'scripts') diff --git a/scripts/lib/wic/plugins/source/bootimg-pcbios.py b/scripts/lib/wic/plugins/source/bootimg-pcbios.py index 74c75a054e..bbc9f473e2 100644 --- a/scripts/lib/wic/plugins/source/bootimg-pcbios.py +++ b/scripts/lib/wic/plugins/source/bootimg-pcbios.py @@ -96,8 +96,8 @@ class BootimgPcbiosPlugin(SourcePlugin): logger.debug("Using custom configuration file %s " "for syslinux.cfg", bootloader.configfile) else: - logger.error("configfile is specified but failed to " - "get it from %s.", bootloader.configfile) + raise WicError("configfile is specified but failed to " + "get it from %s." % bootloader.configfile) if not custom_cfg: # Create syslinux configuration using parameters from wks file diff --git a/scripts/lib/wic/utils/misc.py b/scripts/lib/wic/utils/misc.py index 216ab7b6ce..c941112c63 100644 --- a/scripts/lib/wic/utils/misc.py +++ b/scripts/lib/wic/utils/misc.py @@ -136,7 +136,7 @@ def exec_native_cmd(cmd_and_args, native_sysroot, catch=3, pseudo=""): else: msg += "Wic failed to find a recipe to build native %s. Please "\ "file a bug against wic.\n" % prog - logger.error(msg) + raise WicError(msg) return ret, out -- cgit 1.2.3-korg