From f8a4bd99503f5b63bbc748fedd4b7f32afbf0cb7 Mon Sep 17 00:00:00 2001 From: Ed Bartosh Date: Wed, 15 Feb 2017 00:07:14 +0200 Subject: wic: move WicError to lib/wic/__init__.py Removed unused exceptions from error.py Moved definition of WicError to lib/wic/__init__.py (From OE-Core rev: 15442d072bb6d93bd9b941726f93262503053da5) Signed-off-by: Ed Bartosh Signed-off-by: Richard Purdie --- scripts/lib/wic/__init__.py | 20 +++++++++++++++ scripts/lib/wic/engine.py | 2 +- scripts/lib/wic/errors.py | 29 ---------------------- scripts/lib/wic/partition.py | 2 +- scripts/lib/wic/plugin.py | 3 +-- scripts/lib/wic/plugins/imager/direct.py | 2 +- scripts/lib/wic/plugins/source/bootimg-efi.py | 2 +- .../lib/wic/plugins/source/bootimg-partition.py | 2 +- scripts/lib/wic/plugins/source/bootimg-pcbios.py | 2 +- scripts/lib/wic/plugins/source/fsimage.py | 2 +- .../lib/wic/plugins/source/isoimage-isohybrid.py | 2 +- scripts/lib/wic/plugins/source/rawcopy.py | 2 +- scripts/lib/wic/plugins/source/rootfs.py | 2 +- .../lib/wic/plugins/source/rootfs_pcbios_ext.py | 2 +- scripts/lib/wic/utils/misc.py | 2 +- scripts/lib/wic/utils/runner.py | 2 +- scripts/wic | 2 +- 17 files changed, 35 insertions(+), 45 deletions(-) delete mode 100644 scripts/lib/wic/errors.py diff --git a/scripts/lib/wic/__init__.py b/scripts/lib/wic/__init__.py index e69de29bb2..85876b138c 100644 --- a/scripts/lib/wic/__init__.py +++ b/scripts/lib/wic/__init__.py @@ -0,0 +1,20 @@ +#!/usr/bin/env python -tt +# +# Copyright (c) 2007 Red Hat, Inc. +# Copyright (c) 2011 Intel, Inc. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the Free +# Software Foundation; version 2 of the License +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY +# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., 59 +# Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +class WicError(Exception): + pass diff --git a/scripts/lib/wic/engine.py b/scripts/lib/wic/engine.py index 38a68ed340..c29924b781 100644 --- a/scripts/lib/wic/engine.py +++ b/scripts/lib/wic/engine.py @@ -31,7 +31,7 @@ import logging import os -from wic.errors import WicError +from wic import WicError from wic.plugin import pluginmgr from wic.utils.misc import get_bitbake_var diff --git a/scripts/lib/wic/errors.py b/scripts/lib/wic/errors.py deleted file mode 100644 index d1b514dd9d..0000000000 --- a/scripts/lib/wic/errors.py +++ /dev/null @@ -1,29 +0,0 @@ -#!/usr/bin/env python -tt -# -# Copyright (c) 2007 Red Hat, Inc. -# Copyright (c) 2011 Intel, Inc. -# -# This program is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the Free -# Software Foundation; version 2 of the License -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY -# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# for more details. -# -# You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., 59 -# Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -class WicError(Exception): - pass - -class CreatorError(WicError): - pass - -class Usage(WicError): - pass - -class ImageError(WicError): - pass diff --git a/scripts/lib/wic/partition.py b/scripts/lib/wic/partition.py index e100377933..8e531e4dcc 100644 --- a/scripts/lib/wic/partition.py +++ b/scripts/lib/wic/partition.py @@ -28,7 +28,7 @@ import logging import os import tempfile -from wic.errors import WicError +from wic import WicError from wic.utils.misc import exec_cmd, exec_native_cmd, get_bitbake_var from wic.plugin import pluginmgr diff --git a/scripts/lib/wic/plugin.py b/scripts/lib/wic/plugin.py index 0e98da5c7a..ac55ecf545 100644 --- a/scripts/lib/wic/plugin.py +++ b/scripts/lib/wic/plugin.py @@ -19,8 +19,7 @@ import os import sys import logging -from wic.errors import WicError -from wic import pluginbase +from wic import pluginbase, WicError from wic.utils.misc import get_bitbake_var __ALL__ = ['PluginMgr', 'pluginmgr'] diff --git a/scripts/lib/wic/plugins/imager/direct.py b/scripts/lib/wic/plugins/imager/direct.py index 5b20ca9c5b..6d1ed8c205 100644 --- a/scripts/lib/wic/plugins/imager/direct.py +++ b/scripts/lib/wic/plugins/imager/direct.py @@ -32,7 +32,7 @@ import uuid from time import strftime -from wic.errors import WicError +from wic import WicError from wic.filemap import sparse_copy from wic.ksparser import KickStart, KickStartError from wic.plugin import pluginmgr diff --git a/scripts/lib/wic/plugins/source/bootimg-efi.py b/scripts/lib/wic/plugins/source/bootimg-efi.py index 1f018fabf4..2d793a5cb7 100644 --- a/scripts/lib/wic/plugins/source/bootimg-efi.py +++ b/scripts/lib/wic/plugins/source/bootimg-efi.py @@ -28,7 +28,7 @@ import logging import os import shutil -from wic.errors import WicError +from wic import WicError from wic.engine import get_custom_config from wic.pluginbase import SourcePlugin from wic.utils.misc import (exec_cmd, exec_native_cmd, get_bitbake_var, diff --git a/scripts/lib/wic/plugins/source/bootimg-partition.py b/scripts/lib/wic/plugins/source/bootimg-partition.py index e9724a63a3..373e8d8f75 100644 --- a/scripts/lib/wic/plugins/source/bootimg-partition.py +++ b/scripts/lib/wic/plugins/source/bootimg-partition.py @@ -29,7 +29,7 @@ import re from glob import glob -from wic.errors import WicError +from wic import WicError from wic.pluginbase import SourcePlugin from wic.utils.misc import exec_cmd, get_bitbake_var diff --git a/scripts/lib/wic/plugins/source/bootimg-pcbios.py b/scripts/lib/wic/plugins/source/bootimg-pcbios.py index c3a0e4eb42..74c75a054e 100644 --- a/scripts/lib/wic/plugins/source/bootimg-pcbios.py +++ b/scripts/lib/wic/plugins/source/bootimg-pcbios.py @@ -27,8 +27,8 @@ import logging import os +from wic import WicError from wic.engine import get_custom_config -from wic.errors import WicError from wic.utils import runner from wic.pluginbase import SourcePlugin from wic.utils.misc import (exec_cmd, exec_native_cmd, diff --git a/scripts/lib/wic/plugins/source/fsimage.py b/scripts/lib/wic/plugins/source/fsimage.py index 67fc6d1b04..8fbe44d975 100644 --- a/scripts/lib/wic/plugins/source/fsimage.py +++ b/scripts/lib/wic/plugins/source/fsimage.py @@ -18,7 +18,7 @@ import logging import os -from wic.errors import WicError +from wic import WicError from wic.pluginbase import SourcePlugin from wic.utils.misc import get_bitbake_var diff --git a/scripts/lib/wic/plugins/source/isoimage-isohybrid.py b/scripts/lib/wic/plugins/source/isoimage-isohybrid.py index df86acc0e0..1ceba62be0 100644 --- a/scripts/lib/wic/plugins/source/isoimage-isohybrid.py +++ b/scripts/lib/wic/plugins/source/isoimage-isohybrid.py @@ -26,7 +26,7 @@ import os import re import shutil -from wic.errors import WicError +from wic import WicError from wic.engine import get_custom_config from wic.pluginbase import SourcePlugin from wic.utils.misc import exec_cmd, exec_native_cmd, get_bitbake_var diff --git a/scripts/lib/wic/plugins/source/rawcopy.py b/scripts/lib/wic/plugins/source/rawcopy.py index 561280977a..12348ae35e 100644 --- a/scripts/lib/wic/plugins/source/rawcopy.py +++ b/scripts/lib/wic/plugins/source/rawcopy.py @@ -18,7 +18,7 @@ import logging import os -from wic.errors import WicError +from wic import WicError from wic.pluginbase import SourcePlugin from wic.utils.misc import exec_cmd, get_bitbake_var from wic.filemap import sparse_copy diff --git a/scripts/lib/wic/plugins/source/rootfs.py b/scripts/lib/wic/plugins/source/rootfs.py index f7ca569604..f2e2ca8a2b 100644 --- a/scripts/lib/wic/plugins/source/rootfs.py +++ b/scripts/lib/wic/plugins/source/rootfs.py @@ -31,7 +31,7 @@ import shutil from oe.path import copyhardlinktree -from wic.errors import WicError +from wic import WicError from wic.pluginbase import SourcePlugin from wic.utils.misc import get_bitbake_var, exec_cmd diff --git a/scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py b/scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py index cf0eec2fe3..94f80d07ae 100644 --- a/scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py +++ b/scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py @@ -22,7 +22,7 @@ import logging import os import re -from wic.errors import WicError +from wic import WicError from wic.utils import runner from wic.utils.misc import get_bitbake_var, exec_cmd, exec_native_cmd from wic.pluginbase import SourcePlugin diff --git a/scripts/lib/wic/utils/misc.py b/scripts/lib/wic/utils/misc.py index 94fdab2669..4b822f0eee 100644 --- a/scripts/lib/wic/utils/misc.py +++ b/scripts/lib/wic/utils/misc.py @@ -33,7 +33,7 @@ import re from collections import defaultdict from distutils import spawn -from wic.errors import WicError +from wic import WicError from wic.utils import runner logger = logging.getLogger('wic') diff --git a/scripts/lib/wic/utils/runner.py b/scripts/lib/wic/utils/runner.py index 5ede1929a3..56d7ea3adf 100644 --- a/scripts/lib/wic/utils/runner.py +++ b/scripts/lib/wic/utils/runner.py @@ -19,7 +19,7 @@ import logging import os import subprocess -from wic.errors import WicError +from wic import WicError logger = logging.getLogger('wic') diff --git a/scripts/wic b/scripts/wic index 97af72b104..f32cb19b34 100755 --- a/scripts/wic +++ b/scripts/wic @@ -53,7 +53,7 @@ if bitbake_exe: else: bitbake_main = None -from wic.errors import WicError +from wic import WicError from wic.utils.misc import get_bitbake_var, BB_VARS from wic import engine from wic import help as hlp -- cgit v1.2.3-54-g00ecf