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>
This commit is contained in:
parent
28014087b8
commit
79c066b298
|
@ -19,8 +19,8 @@ import os
|
||||||
import sys
|
import sys
|
||||||
import logging
|
import logging
|
||||||
|
|
||||||
|
from wic.errors import CreatorError
|
||||||
from wic import pluginbase
|
from wic import pluginbase
|
||||||
from wic.utils import errors
|
|
||||||
from wic.utils.misc import get_bitbake_var
|
from wic.utils.misc import get_bitbake_var
|
||||||
|
|
||||||
__ALL__ = ['PluginMgr', 'pluginmgr']
|
__ALL__ = ['PluginMgr', 'pluginmgr']
|
||||||
|
@ -110,7 +110,7 @@ class PluginMgr():
|
||||||
""" the return value is dict of name:class pairs """
|
""" the return value is dict of name:class pairs """
|
||||||
|
|
||||||
if ptype not in PLUGIN_TYPES:
|
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)
|
plugins_dir = self._build_plugin_dir_list(self.plugin_dir, ptype)
|
||||||
|
|
||||||
|
|
|
@ -33,11 +33,11 @@ import uuid
|
||||||
|
|
||||||
from time import strftime
|
from time import strftime
|
||||||
|
|
||||||
|
from wic.errors import ImageError
|
||||||
from wic.filemap import sparse_copy
|
from wic.filemap import sparse_copy
|
||||||
from wic.ksparser import KickStart, KickStartError
|
from wic.ksparser import KickStart, KickStartError
|
||||||
from wic.plugin import pluginmgr
|
from wic.plugin import pluginmgr
|
||||||
from wic.pluginbase import ImagerPlugin
|
from wic.pluginbase import ImagerPlugin
|
||||||
from wic.utils.errors import ImageError
|
|
||||||
from wic.utils.misc import get_bitbake_var, exec_cmd, exec_native_cmd
|
from wic.utils.misc import get_bitbake_var, exec_cmd, exec_native_cmd
|
||||||
|
|
||||||
logger = logging.getLogger('wic')
|
logger = logging.getLogger('wic')
|
||||||
|
|
|
@ -29,8 +29,8 @@ import os
|
||||||
import sys
|
import sys
|
||||||
|
|
||||||
from wic.engine import get_custom_config
|
from wic.engine import get_custom_config
|
||||||
|
from wic.errors import ImageError
|
||||||
from wic.utils import runner
|
from wic.utils import runner
|
||||||
from wic.utils.errors import ImageError
|
|
||||||
from wic.pluginbase import SourcePlugin
|
from wic.pluginbase import SourcePlugin
|
||||||
from wic.utils.misc import (exec_cmd, exec_native_cmd,
|
from wic.utils.misc import (exec_cmd, exec_native_cmd,
|
||||||
get_bitbake_var, BOOTDD_EXTRA_SPACE)
|
get_bitbake_var, BOOTDD_EXTRA_SPACE)
|
||||||
|
|
|
@ -23,9 +23,9 @@ import os
|
||||||
import re
|
import re
|
||||||
import sys
|
import sys
|
||||||
|
|
||||||
|
from wic.errors import ImageError
|
||||||
from wic.utils import runner
|
from wic.utils import runner
|
||||||
from wic.utils.misc import get_bitbake_var, exec_cmd, exec_native_cmd
|
from wic.utils.misc import get_bitbake_var, exec_cmd, exec_native_cmd
|
||||||
from wic.utils.errors import ImageError
|
|
||||||
from wic.pluginbase import SourcePlugin
|
from wic.pluginbase import SourcePlugin
|
||||||
|
|
||||||
logger = logging.getLogger('wic')
|
logger = logging.getLogger('wic')
|
||||||
|
|
|
@ -53,8 +53,8 @@ if bitbake_exe:
|
||||||
else:
|
else:
|
||||||
bitbake_main = None
|
bitbake_main = None
|
||||||
|
|
||||||
|
from wic.errors import WicError
|
||||||
from wic.utils.misc import get_bitbake_var, BB_VARS
|
from wic.utils.misc import get_bitbake_var, BB_VARS
|
||||||
from wic.utils.errors import WicError
|
|
||||||
from wic import engine
|
from wic import engine
|
||||||
from wic import help as hlp
|
from wic import help as hlp
|
||||||
|
|
||||||
|
@ -339,4 +339,3 @@ if __name__ == "__main__":
|
||||||
except WicError as err:
|
except WicError as err:
|
||||||
logger.error(err)
|
logger.error(err)
|
||||||
sys.exit(1)
|
sys.exit(1)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue