diff options
author | Ed Bartosh <ed.bartosh@linux.intel.com> | 2017-02-14 23:47:06 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-03-04 10:42:30 +0000 |
commit | b952076cc9f458c3d5eb03e12dc3ec316a44804c (patch) | |
tree | 40502b7574f381e76091416fc876eb9003a25977 /scripts/lib/wic/plugins/source | |
parent | 92e8c81c941597eb2b4b61d5c28833e4826888f8 (diff) | |
download | openembedded-core-contrib-b952076cc9f458c3d5eb03e12dc3ec316a44804c.tar.gz |
wic: raise WicError instead of ImageError and CreatorError
There is no need to raise special exceptions. Raising
WicError should be enough.
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Diffstat (limited to 'scripts/lib/wic/plugins/source')
-rw-r--r-- | scripts/lib/wic/plugins/source/bootimg-pcbios.py | 4 | ||||
-rw-r--r-- | scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/scripts/lib/wic/plugins/source/bootimg-pcbios.py b/scripts/lib/wic/plugins/source/bootimg-pcbios.py index 2ded2dac52..c3a0e4eb42 100644 --- a/scripts/lib/wic/plugins/source/bootimg-pcbios.py +++ b/scripts/lib/wic/plugins/source/bootimg-pcbios.py @@ -28,7 +28,7 @@ import logging import os from wic.engine import get_custom_config -from wic.errors import ImageError, WicError +from wic.errors import WicError from wic.utils import runner from wic.pluginbase import SourcePlugin from wic.utils.misc import (exec_cmd, exec_native_cmd, @@ -71,7 +71,7 @@ class BootimgPcbiosPlugin(SourcePlugin): rcode = runner.show(['dd', 'if=%s' % mbrfile, 'of=%s' % full_path, 'conv=notrunc']) if rcode != 0: - raise ImageError("Unable to set MBR to %s" % full_path) + raise WicError("Unable to set MBR to %s" % full_path) @classmethod def do_configure_partition(cls, part, source_params, creator, cr_workdir, diff --git a/scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py b/scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py index 4cc3a39856..cf0eec2fe3 100644 --- a/scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py +++ b/scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py @@ -22,7 +22,7 @@ import logging import os import re -from wic.errors import ImageError, WicError +from wic.errors import WicError from wic.utils import runner from wic.utils.misc import get_bitbake_var, exec_cmd, exec_native_cmd from wic.pluginbase import SourcePlugin @@ -210,4 +210,4 @@ class RootfsPlugin(SourcePlugin): ret_code = runner.show(['dd', 'if=%s' % mbrfile, 'of=%s' % full_path, 'conv=notrunc']) if ret_code != 0: - raise ImageError("Unable to set MBR to %s" % full_path) + raise WicError("Unable to set MBR to %s" % full_path) |