diff options
| author | Ed Bartosh <ed.bartosh@linux.intel.com> | 2017-02-14 21:31:05 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-03-04 10:42:29 +0000 |
| commit | 808c70b81de5c3cfc3dcb01f08213e2ea33b7252 (patch) | |
| tree | cb3bd5e84ccdfc260d77d49f38aaca6cbbbc47d0 /scripts/lib | |
| parent | 8fdceeee99c3fc60649414b39933ec295c810e6b (diff) | |
| download | openembedded-core-808c70b81de5c3cfc3dcb01f08213e2ea33b7252.tar.gz openembedded-core-808c70b81de5c3cfc3dcb01f08213e2ea33b7252.tar.bz2 openembedded-core-808c70b81de5c3cfc3dcb01f08213e2ea33b7252.zip | |
wic: move errors module
Moved from lib/wic/utils/ to lib/wic as this is a core module.
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Diffstat (limited to 'scripts/lib')
| -rw-r--r-- | scripts/lib/wic/errors.py (renamed from scripts/lib/wic/utils/errors.py) | 0 | ||||
| -rw-r--r-- | scripts/lib/wic/plugin.py | 4 | ||||
| -rw-r--r-- | scripts/lib/wic/plugins/imager/direct.py | 2 | ||||
| -rw-r--r-- | scripts/lib/wic/plugins/source/bootimg-pcbios.py | 2 | ||||
| -rw-r--r-- | scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/scripts/lib/wic/utils/errors.py b/scripts/lib/wic/errors.py index d1b514dd9d..d1b514dd9d 100644 --- a/scripts/lib/wic/utils/errors.py +++ b/scripts/lib/wic/errors.py diff --git a/scripts/lib/wic/plugin.py b/scripts/lib/wic/plugin.py index 70d337789f..31311adb55 100644 --- a/scripts/lib/wic/plugin.py +++ b/scripts/lib/wic/plugin.py @@ -19,8 +19,8 @@ import os import sys import logging +from wic.errors import CreatorError from wic import pluginbase -from wic.utils import errors from wic.utils.misc import get_bitbake_var __ALL__ = ['PluginMgr', 'pluginmgr'] @@ -110,7 +110,7 @@ class PluginMgr(): """ the return value is dict of name:class pairs """ if ptype not in PLUGIN_TYPES: - raise errors.CreatorError('%s is not valid plugin type' % ptype) + raise CreatorError('%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 2e2d26ad7d..e51c8be298 100644 --- a/scripts/lib/wic/plugins/imager/direct.py +++ b/scripts/lib/wic/plugins/imager/direct.py @@ -33,11 +33,11 @@ import uuid from time import strftime +from wic.errors import ImageError from wic.filemap import sparse_copy from wic.ksparser import KickStart, KickStartError from wic.plugin import pluginmgr from wic.pluginbase import ImagerPlugin -from wic.utils.errors import ImageError from wic.utils.misc import get_bitbake_var, exec_cmd, exec_native_cmd logger = logging.getLogger('wic') diff --git a/scripts/lib/wic/plugins/source/bootimg-pcbios.py b/scripts/lib/wic/plugins/source/bootimg-pcbios.py index 590d3d6784..8f53fa2a48 100644 --- a/scripts/lib/wic/plugins/source/bootimg-pcbios.py +++ b/scripts/lib/wic/plugins/source/bootimg-pcbios.py @@ -29,8 +29,8 @@ import os import sys from wic.engine import get_custom_config +from wic.errors import ImageError from wic.utils import runner -from wic.utils.errors import ImageError from wic.pluginbase import SourcePlugin from wic.utils.misc import (exec_cmd, exec_native_cmd, get_bitbake_var, BOOTDD_EXTRA_SPACE) diff --git a/scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py b/scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py index ed5fbdfa9c..850aa5aaf1 100644 --- a/scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py +++ b/scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py @@ -23,9 +23,9 @@ import os import re import sys +from wic.errors import ImageError from wic.utils import runner from wic.utils.misc import get_bitbake_var, exec_cmd, exec_native_cmd -from wic.utils.errors import ImageError from wic.pluginbase import SourcePlugin logger = logging.getLogger('wic') |