From 808c70b81de5c3cfc3dcb01f08213e2ea33b7252 Mon Sep 17 00:00:00 2001 From: Ed Bartosh Date: Tue, 14 Feb 2017 21:31:05 +0200 Subject: wic: move errors module Moved from lib/wic/utils/ to lib/wic as this is a core module. Signed-off-by: Ed Bartosh --- scripts/lib/wic/plugins/imager/direct.py | 2 +- scripts/lib/wic/plugins/source/bootimg-pcbios.py | 2 +- scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'scripts/lib/wic/plugins') 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') -- cgit v1.2.3