summaryrefslogtreecommitdiffstats
path: root/scripts
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 23:18:18 +0000
commitaad85050d7ff1ef293cae786103ba06f78cc505a (patch)
tree0a633d8a92c15c57d0a517de20b2ca43aa34e4be /scripts
parentee860b3bf5117ef4b01530d336dd9c4e0d7b5550 (diff)
downloadpoky-aad85050d7ff1ef293cae786103ba06f78cc505a.tar.gz
wic: raise WicError instead of calling logger.error
Replaced forgotten calls of logger.error with raising WicError exception. Otherwise errors will be ignored. (From OE-Core rev: 7a5156092699593903a4bedb4cb23cc6e42ea62e) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-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):
96 logger.debug("Using custom configuration file %s " 96 logger.debug("Using custom configuration file %s "
97 "for syslinux.cfg", bootloader.configfile) 97 "for syslinux.cfg", bootloader.configfile)
98 else: 98 else:
99 logger.error("configfile is specified but failed to " 99 raise WicError("configfile is specified but failed to "
100 "get it from %s.", bootloader.configfile) 100 "get it from %s." % bootloader.configfile)
101 101
102 if not custom_cfg: 102 if not custom_cfg:
103 # Create syslinux configuration using parameters from wks file 103 # 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=""):
136 else: 136 else:
137 msg += "Wic failed to find a recipe to build native %s. Please "\ 137 msg += "Wic failed to find a recipe to build native %s. Please "\
138 "file a bug against wic.\n" % prog 138 "file a bug against wic.\n" % prog
139 logger.error(msg) 139 raise WicError(msg)
140 140
141 return ret, out 141 return ret, out
142 142