diff options
| -rw-r--r-- | scripts/lib/wic/plugin.py | 4 | ||||
| -rw-r--r-- | scripts/lib/wic/plugins/imager/direct.py | 6 | ||||
| -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 |
4 files changed, 9 insertions, 9 deletions
diff --git a/scripts/lib/wic/plugin.py b/scripts/lib/wic/plugin.py index 31311adb55..0e98da5c7a 100644 --- a/scripts/lib/wic/plugin.py +++ b/scripts/lib/wic/plugin.py @@ -19,7 +19,7 @@ import os import sys import logging -from wic.errors import CreatorError +from wic.errors import WicError from wic import pluginbase from wic.utils.misc import get_bitbake_var @@ -110,7 +110,7 @@ class PluginMgr(): """ the return value is dict of name:class pairs """ if ptype not in PLUGIN_TYPES: - raise CreatorError('%s is not valid plugin type' % ptype) + raise WicError('%s is not valid plugin type' % ptype) plugins_dir = self._build_plugin_dir_list(self.plugin_dir, ptype) diff --git a/scripts/lib/wic/plugins/imager/direct.py b/scripts/lib/wic/plugins/imager/direct.py index 9c8a2304a7..5b20ca9c5b 100644 --- a/scripts/lib/wic/plugins/imager/direct.py +++ b/scripts/lib/wic/plugins/imager/direct.py @@ -32,7 +32,7 @@ import uuid from time import strftime -from wic.errors import ImageError, WicError +from wic.errors import WicError from wic.filemap import sparse_copy from wic.ksparser import KickStart, KickStartError from wic.plugin import pluginmgr @@ -355,8 +355,8 @@ class PartitionedImage(): # The --part-type can also be implemented for MBR partitions, # in which case it would map to the 1-byte "partition type" # filed at offset 3 of the partition entry. - raise ImageError("setting custom partition type is not " \ - "implemented for msdos partitions") + raise WicError("setting custom partition type is not " \ + "implemented for msdos partitions") # Get the disk where the partition is located self.numpart += 1 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) |