summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2017-02-21 17:12:35 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-03-04 10:42:32 +0000
commit7a5156092699593903a4bedb4cb23cc6e42ea62e (patch)
tree804845ef8bd16009487f79aea171c1d86c0bc22b
parent243ccd6b8b389231f6c4a8e251c2bd6b2cf6eaad (diff)
downloadopenembedded-core-7a5156092699593903a4bedb4cb23cc6e42ea62e.tar.gz
openembedded-core-7a5156092699593903a4bedb4cb23cc6e42ea62e.tar.bz2
openembedded-core-7a5156092699593903a4bedb4cb23cc6e42ea62e.zip
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 <ed.bartosh@linux.intel.com>
-rw-r--r--scripts/lib/wic/plugins/source/bootimg-pcbios.py4
-rw-r--r--scripts/lib/wic/utils/misc.py2
2 files changed, 3 insertions, 3 deletions
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