summaryrefslogtreecommitdiffstats
path: root/scripts/lib
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2017-02-14 21:31:05 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-03-04 23:18:16 +0000
commit79c066b2988295cfa8b727d289b7251e40451586 (patch)
tree910b76c9b0cfa288f26a43224779952520957d61 /scripts/lib
parent28014087b8091e61c992aa66d4feef55a433e704 (diff)
downloadpoky-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')
-rw-r--r--scripts/lib/wic/errors.py (renamed from scripts/lib/wic/utils/errors.py)0
-rw-r--r--scripts/lib/wic/plugin.py4
-rw-r--r--scripts/lib/wic/plugins/imager/direct.py2
-rw-r--r--scripts/lib/wic/plugins/source/bootimg-pcbios.py2
-rw-r--r--scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py2
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
19import sys 19import sys
20import logging 20import logging
21 21
22from wic.errors import CreatorError
22from wic import pluginbase 23from wic import pluginbase
23from wic.utils import errors
24from wic.utils.misc import get_bitbake_var 24from 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
34from time import strftime 34from time import strftime
35 35
36from wic.errors import ImageError
36from wic.filemap import sparse_copy 37from wic.filemap import sparse_copy
37from wic.ksparser import KickStart, KickStartError 38from wic.ksparser import KickStart, KickStartError
38from wic.plugin import pluginmgr 39from wic.plugin import pluginmgr
39from wic.pluginbase import ImagerPlugin 40from wic.pluginbase import ImagerPlugin
40from wic.utils.errors import ImageError
41from wic.utils.misc import get_bitbake_var, exec_cmd, exec_native_cmd 41from wic.utils.misc import get_bitbake_var, exec_cmd, exec_native_cmd
42 42
43logger = logging.getLogger('wic') 43logger = 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
29import sys 29import sys
30 30
31from wic.engine import get_custom_config 31from wic.engine import get_custom_config
32from wic.errors import ImageError
32from wic.utils import runner 33from wic.utils import runner
33from wic.utils.errors import ImageError
34from wic.pluginbase import SourcePlugin 34from wic.pluginbase import SourcePlugin
35from wic.utils.misc import (exec_cmd, exec_native_cmd, 35from 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
23import re 23import re
24import sys 24import sys
25 25
26from wic.errors import ImageError
26from wic.utils import runner 27from wic.utils import runner
27from wic.utils.misc import get_bitbake_var, exec_cmd, exec_native_cmd 28from wic.utils.misc import get_bitbake_var, exec_cmd, exec_native_cmd
28from wic.utils.errors import ImageError
29from wic.pluginbase import SourcePlugin 29from wic.pluginbase import SourcePlugin
30 30
31logger = logging.getLogger('wic') 31logger = logging.getLogger('wic')