summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2017-02-14 23:47:06 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-03-04 23:18:17 +0000
commitaf17aa91b32421100d8898a7c95049068e8e0e26 (patch)
treed322e68977a5626ad04ac119bc565b829e02f530
parent8da175607c0d3434428a3bf4ee1549919b698709 (diff)
downloadpoky-af17aa91b32421100d8898a7c95049068e8e0e26.tar.gz
wic: raise WicError instead of ImageError and CreatorError
There is no need to raise special exceptions. Raising WicError should be enough. (From OE-Core rev: b952076cc9f458c3d5eb03e12dc3ec316a44804c) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--scripts/lib/wic/plugin.py4
-rw-r--r--scripts/lib/wic/plugins/imager/direct.py6
-rw-r--r--scripts/lib/wic/plugins/source/bootimg-pcbios.py4
-rw-r--r--scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py4
4 files changed, 9 insertions, 9 deletions
diff --git a/scripts/lib/wic/plugin.py b/scripts/lib/wic/plugin.py
index 31311adb55..0e98da5c7a 100644
--- a/scripts/lib/wic/plugin.py
+++ b/scripts/lib/wic/plugin.py
@@ -19,7 +19,7 @@ import os
19import sys 19import sys
20import logging 20import logging
21 21
22from wic.errors import CreatorError 22from wic.errors import WicError
23from wic import pluginbase 23from wic import pluginbase
24from wic.utils.misc import get_bitbake_var 24from wic.utils.misc import get_bitbake_var
25 25
@@ -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 CreatorError('%s is not valid plugin type' % ptype) 113 raise WicError('%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 9c8a2304a7..5b20ca9c5b 100644
--- a/scripts/lib/wic/plugins/imager/direct.py
+++ b/scripts/lib/wic/plugins/imager/direct.py
@@ -32,7 +32,7 @@ import uuid
32 32
33from time import strftime 33from time import strftime
34 34
35from wic.errors import ImageError, WicError 35from wic.errors import WicError
36from wic.filemap import sparse_copy 36from wic.filemap import sparse_copy
37from wic.ksparser import KickStart, KickStartError 37from wic.ksparser import KickStart, KickStartError
38from wic.plugin import pluginmgr 38from wic.plugin import pluginmgr
@@ -355,8 +355,8 @@ class PartitionedImage():
355 # The --part-type can also be implemented for MBR partitions, 355 # The --part-type can also be implemented for MBR partitions,
356 # in which case it would map to the 1-byte "partition type" 356 # in which case it would map to the 1-byte "partition type"
357 # filed at offset 3 of the partition entry. 357 # filed at offset 3 of the partition entry.
358 raise ImageError("setting custom partition type is not " \ 358 raise WicError("setting custom partition type is not " \
359 "implemented for msdos partitions") 359 "implemented for msdos partitions")
360 360
361 # Get the disk where the partition is located 361 # Get the disk where the partition is located
362 self.numpart += 1 362 self.numpart += 1
diff --git a/scripts/lib/wic/plugins/source/bootimg-pcbios.py b/scripts/lib/wic/plugins/source/bootimg-pcbios.py
index 2ded2dac52..c3a0e4eb42 100644
--- a/scripts/lib/wic/plugins/source/bootimg-pcbios.py
+++ b/scripts/lib/wic/plugins/source/bootimg-pcbios.py
@@ -28,7 +28,7 @@ import logging
28import os 28import os
29 29
30from wic.engine import get_custom_config 30from wic.engine import get_custom_config
31from wic.errors import ImageError, WicError 31from wic.errors import WicError
32from wic.utils import runner 32from wic.utils import runner
33from wic.pluginbase import SourcePlugin 33from wic.pluginbase import SourcePlugin
34from wic.utils.misc import (exec_cmd, exec_native_cmd, 34from wic.utils.misc import (exec_cmd, exec_native_cmd,
@@ -71,7 +71,7 @@ class BootimgPcbiosPlugin(SourcePlugin):
71 rcode = runner.show(['dd', 'if=%s' % mbrfile, 71 rcode = runner.show(['dd', 'if=%s' % mbrfile,
72 'of=%s' % full_path, 'conv=notrunc']) 72 'of=%s' % full_path, 'conv=notrunc'])
73 if rcode != 0: 73 if rcode != 0:
74 raise ImageError("Unable to set MBR to %s" % full_path) 74 raise WicError("Unable to set MBR to %s" % full_path)
75 75
76 @classmethod 76 @classmethod
77 def do_configure_partition(cls, part, source_params, creator, cr_workdir, 77 def do_configure_partition(cls, part, source_params, creator, cr_workdir,
diff --git a/scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py b/scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py
index 4cc3a39856..cf0eec2fe3 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
22import os 22import os
23import re 23import re
24 24
25from wic.errors import ImageError, WicError 25from wic.errors import WicError
26from wic.utils import runner 26from wic.utils import runner
27from wic.utils.misc import get_bitbake_var, exec_cmd, exec_native_cmd 27from wic.utils.misc import get_bitbake_var, exec_cmd, exec_native_cmd
28from wic.pluginbase import SourcePlugin 28from wic.pluginbase import SourcePlugin
@@ -210,4 +210,4 @@ class RootfsPlugin(SourcePlugin):
210 210
211 ret_code = runner.show(['dd', 'if=%s' % mbrfile, 'of=%s' % full_path, 'conv=notrunc']) 211 ret_code = runner.show(['dd', 'if=%s' % mbrfile, 'of=%s' % full_path, 'conv=notrunc'])
212 if ret_code != 0: 212 if ret_code != 0:
213 raise ImageError("Unable to set MBR to %s" % full_path) 213 raise WicError("Unable to set MBR to %s" % full_path)