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 23:18:16 +0000 |
commit | 79c066b2988295cfa8b727d289b7251e40451586 (patch) | |
tree | 910b76c9b0cfa288f26a43224779952520957d61 /scripts/lib/wic/plugins | |
parent | 28014087b8091e61c992aa66d4feef55a433e704 (diff) | |
download | poky-79c066b2988295cfa8b727d289b7251e40451586.tar.gz |
wic: move errors module
Moved from lib/wic/utils/ to lib/wic as this is a core module.
(From OE-Core rev: 808c70b81de5c3cfc3dcb01f08213e2ea33b7252)
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib/wic/plugins')
-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 |
3 files changed, 3 insertions, 3 deletions
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') |