sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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>
This commit is contained in:
Ed Bartosh 2017-02-14 23:47:06 +02:00 committed by Richard Purdie
parent 8da175607c
commit af17aa91b3
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/lib/wic/plugin.py
View File

@ -19,7 +19,7 @@ import os
import sys import sys
import logging import logging
from wic.errors import CreatorError from wic.errors import WicError
from wic import pluginbase from wic import pluginbase
from wic.utils.misc import get_bitbake_var from wic.utils.misc import get_bitbake_var
@ -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 CreatorError('%s is not valid plugin type' % ptype) raise WicError('%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)

6
scripts/lib/wic/plugins/imager/direct.py
View File

@ -32,7 +32,7 @@ import uuid
from time import strftime from time import strftime
from wic.errors import ImageError, WicError from wic.errors import WicError
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
@ -355,8 +355,8 @@ class PartitionedImage():
# The --part-type can also be implemented for MBR partitions, # The --part-type can also be implemented for MBR partitions,
# in which case it would map to the 1-byte "partition type" # in which case it would map to the 1-byte "partition type"
# filed at offset 3 of the partition entry. # filed at offset 3 of the partition entry.
raise ImageError("setting custom partition type is not " \ raise WicError("setting custom partition type is not " \
"implemented for msdos partitions") "implemented for msdos partitions")
# Get the disk where the partition is located # Get the disk where the partition is located
self.numpart += 1 self.numpart += 1

4
scripts/lib/wic/plugins/source/bootimg-pcbios.py
View File

@ -28,7 +28,7 @@ import logging
import os import os
from wic.engine import get_custom_config from wic.engine import get_custom_config
from wic.errors import ImageError, WicError from wic.errors import WicError
from wic.utils import runner from wic.utils import runner
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,
@ -71,7 +71,7 @@ class BootimgPcbiosPlugin(SourcePlugin):
rcode = runner.show(['dd', 'if=%s' % mbrfile, rcode = runner.show(['dd', 'if=%s' % mbrfile,
'of=%s' % full_path, 'conv=notrunc']) 'of=%s' % full_path, 'conv=notrunc'])
if rcode != 0: if rcode != 0:
raise ImageError("Unable to set MBR to %s" % full_path) raise WicError("Unable to set MBR to %s" % full_path)
@classmethod @classmethod
def do_configure_partition(cls, part, source_params, creator, cr_workdir, def do_configure_partition(cls, part, source_params, creator, cr_workdir,

4
scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py
View File

@ -22,7 +22,7 @@ import logging
import os import os
import re import re
from wic.errors import ImageError, WicError from wic.errors import WicError
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.pluginbase import SourcePlugin from wic.pluginbase import SourcePlugin
@ -210,4 +210,4 @@ class RootfsPlugin(SourcePlugin):
ret_code = runner.show(['dd', 'if=%s' % mbrfile, 'of=%s' % full_path, 'conv=notrunc']) ret_code = runner.show(['dd', 'if=%s' % mbrfile, 'of=%s' % full_path, 'conv=notrunc'])
if ret_code != 0: if ret_code != 0:
raise ImageError("Unable to set MBR to %s" % full_path) raise WicError("Unable to set MBR to %s" % full_path)