diff options
Diffstat (limited to 'scripts/lib/wic')
-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 | |||
19 | import sys | 19 | import sys |
20 | import logging | 20 | import logging |
21 | 21 | ||
22 | from wic.errors import CreatorError | ||
22 | from wic import pluginbase | 23 | from wic import pluginbase |
23 | from wic.utils import errors | ||
24 | from wic.utils.misc import get_bitbake_var | 24 | from wic.utils.misc import get_bitbake_var |
25 | 25 | ||
26 | __ALL__ = ['PluginMgr', 'pluginmgr'] | 26 | __ALL__ = ['PluginMgr', 'pluginmgr'] |
@@ -110,7 +110,7 @@ class PluginMgr(): | |||
110 | """ the return value is dict of name:class pairs """ | 110 | """ the return value is dict of name:class pairs """ |
111 | 111 | ||
112 | if ptype not in PLUGIN_TYPES: | 112 | if ptype not in PLUGIN_TYPES: |
113 | raise errors.CreatorError('%s is not valid plugin type' % ptype) | 113 | raise CreatorError('%s is not valid plugin type' % ptype) |
114 | 114 | ||
115 | plugins_dir = self._build_plugin_dir_list(self.plugin_dir, ptype) | 115 | plugins_dir = self._build_plugin_dir_list(self.plugin_dir, ptype) |
116 | 116 | ||
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 | |||
33 | 33 | ||
34 | from time import strftime | 34 | from time import strftime |
35 | 35 | ||
36 | from wic.errors import ImageError | ||
36 | from wic.filemap import sparse_copy | 37 | from wic.filemap import sparse_copy |
37 | from wic.ksparser import KickStart, KickStartError | 38 | from wic.ksparser import KickStart, KickStartError |
38 | from wic.plugin import pluginmgr | 39 | from wic.plugin import pluginmgr |
39 | from wic.pluginbase import ImagerPlugin | 40 | from wic.pluginbase import ImagerPlugin |
40 | from wic.utils.errors import ImageError | ||
41 | from wic.utils.misc import get_bitbake_var, exec_cmd, exec_native_cmd | 41 | from wic.utils.misc import get_bitbake_var, exec_cmd, exec_native_cmd |
42 | 42 | ||
43 | logger = logging.getLogger('wic') | 43 | 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 | |||
29 | import sys | 29 | import sys |
30 | 30 | ||
31 | from wic.engine import get_custom_config | 31 | from wic.engine import get_custom_config |
32 | from wic.errors import ImageError | ||
32 | from wic.utils import runner | 33 | from wic.utils import runner |
33 | from wic.utils.errors import ImageError | ||
34 | from wic.pluginbase import SourcePlugin | 34 | from wic.pluginbase import SourcePlugin |
35 | from wic.utils.misc import (exec_cmd, exec_native_cmd, | 35 | from wic.utils.misc import (exec_cmd, exec_native_cmd, |
36 | get_bitbake_var, BOOTDD_EXTRA_SPACE) | 36 | 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 | |||
23 | import re | 23 | import re |
24 | import sys | 24 | import sys |
25 | 25 | ||
26 | from wic.errors import ImageError | ||
26 | from wic.utils import runner | 27 | from wic.utils import runner |
27 | from wic.utils.misc import get_bitbake_var, exec_cmd, exec_native_cmd | 28 | from wic.utils.misc import get_bitbake_var, exec_cmd, exec_native_cmd |
28 | from wic.utils.errors import ImageError | ||
29 | from wic.pluginbase import SourcePlugin | 29 | from wic.pluginbase import SourcePlugin |
30 | 30 | ||
31 | logger = logging.getLogger('wic') | 31 | logger = logging.getLogger('wic') |