summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Zanussi <tom.zanussi@linux.intel.com>2014-08-04 14:27:52 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-08-11 10:52:16 +0100
commitb818e5a1ed047940fda533da73fc50a099e1aa3f (patch)
tree2cdeb4546ec81e084c416467c781ac4f27d9356a
parentd3a490d5421405bf9e002c6c65ffb831ea6b767e (diff)
downloadopenembedded-core-contrib-b818e5a1ed047940fda533da73fc50a099e1aa3f.tar.gz
openembedded-core-contrib-b818e5a1ed047940fda533da73fc50a099e1aa3f.tar.bz2
openembedded-core-contrib-b818e5a1ed047940fda533da73fc50a099e1aa3f.zip
wic: Remove unused plugin and error code
wic doesn't use it, so remove it. Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
-rw-r--r--scripts/lib/mic/plugin.py2
-rw-r--r--scripts/lib/mic/pluginbase.py45
-rw-r--r--scripts/lib/mic/plugins/hook/.py0
-rw-r--r--scripts/lib/mic/plugins/hook/empty_hook.py3
-rw-r--r--scripts/lib/mic/utils/errors.py21
5 files changed, 3 insertions, 68 deletions
diff --git a/scripts/lib/mic/plugin.py b/scripts/lib/mic/plugin.py
index f836950727..43afdbc2f2 100644
--- a/scripts/lib/mic/plugin.py
+++ b/scripts/lib/mic/plugin.py
@@ -24,7 +24,7 @@ from mic.utils.oe.misc import *
__ALL__ = ['PluginMgr', 'pluginmgr']
-PLUGIN_TYPES = ["imager", "source"] # TODO "hook"
+PLUGIN_TYPES = ["imager", "source"]
PLUGIN_DIR = "/lib/mic/plugins" # relative to scripts
SCRIPTS_PLUGIN_DIR = "scripts" + PLUGIN_DIR
diff --git a/scripts/lib/mic/pluginbase.py b/scripts/lib/mic/pluginbase.py
index 9cf4c628d1..46a4f4a6b6 100644
--- a/scripts/lib/mic/pluginbase.py
+++ b/scripts/lib/mic/pluginbase.py
@@ -40,45 +40,10 @@ class _Plugin(object):
def get_plugins(cls):
return cls.plugins
+
class ImagerPlugin(_Plugin):
mic_plugin_type = "imager"
- @classmethod
- def check_image_exists(self, destdir, apacking=None,
- images=(),
- release=None):
-
- # if it's a packing file, reset images
- if apacking:
- images = [apacking]
-
- # release option will override images
- if release is not None:
- images = [os.path.basename(destdir.rstrip('/'))]
- destdir = os.path.dirname(destdir.rstrip('/'))
-
- for name in images:
- if not name:
- continue
-
- image = os.path.join(destdir, name)
- if not os.path.exists(image):
- continue
-
- if msger.ask("Target image/dir: %s already exists, "
- "clean up and continue?" % image):
- if os.path.isdir(image):
- shutil.rmtree(image)
- else:
- os.unlink(image)
- else:
- raise errors.Abort("Cancled")
-
- def do_create(self):
- pass
-
- def do_chroot(self):
- pass
class SourcePlugin(_Plugin):
mic_plugin_type = "source"
@@ -133,12 +98,6 @@ class SourcePlugin(_Plugin):
"""
msger.debug("SourcePlugin: do_prepare_partition: part: %s" % part)
-class BackendPlugin(_Plugin):
- mic_plugin_type="backend"
-
- def addRepository(self):
- pass
-
def get_plugins(typen):
ps = ImagerPlugin.get_plugins()
if typen in ps:
@@ -146,4 +105,4 @@ def get_plugins(typen):
else:
return None
-__all__ = ['ImagerPlugin', 'BackendPlugin', 'SourcePlugin', 'get_plugins']
+__all__ = ['ImagerPlugin', 'SourcePlugin', 'get_plugins']
diff --git a/scripts/lib/mic/plugins/hook/.py b/scripts/lib/mic/plugins/hook/.py
deleted file mode 100644
index e69de29bb2..0000000000
--- a/scripts/lib/mic/plugins/hook/.py
+++ /dev/null
diff --git a/scripts/lib/mic/plugins/hook/empty_hook.py b/scripts/lib/mic/plugins/hook/empty_hook.py
deleted file mode 100644
index 397585d8c1..0000000000
--- a/scripts/lib/mic/plugins/hook/empty_hook.py
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/python
-
-# TODO: plugin base for hooks
diff --git a/scripts/lib/mic/utils/errors.py b/scripts/lib/mic/utils/errors.py
index 8d720f9080..38fda307cf 100644
--- a/scripts/lib/mic/utils/errors.py
+++ b/scripts/lib/mic/utils/errors.py
@@ -43,29 +43,8 @@ class Usage(CreatorError):
class Abort(CreatorError):
keyword = ''
-class ConfigError(CreatorError):
- keyword = '<config>'
-
class KsError(CreatorError):
keyword = '<kickstart>'
-class RepoError(CreatorError):
- keyword = '<repo>'
-
-class RpmError(CreatorError):
- keyword = '<rpm>'
-
class MountError(CreatorError):
keyword = '<mount>'
-
-class SnapshotError(CreatorError):
- keyword = '<snapshot>'
-
-class SquashfsError(CreatorError):
- keyword = '<squashfs>'
-
-class BootstrapError(CreatorError):
- keyword = '<bootstrap>'
-
-class RuntimeError(CreatorError):
- keyword = '<runtime>'