mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-07-25 18:57:02 +00:00
Code Issues Projects Releases Wiki Activity

wic: raise WicError in wic plugins

Browse Source 
Replaced sys.exit with raising WicError in wic plugins.

(From OE-Core rev: 92e8c81c941597eb2b4b61d5c28833e4826888f8)

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:07:35 +02:00
committed by Richard Purdie
parent f5ae79da40
commit 8da175607c
9 changed files with 75 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/lib/wic/plugins/source/bootimg-pcbios.py
+8 -12
View File
@@ -26,10 +26,9 @@
import logging
import os
import sys
from wic.engine import get_custom_config
from wic.errors import ImageError
from wic.errors import ImageError, WicError
from wic.utils import runner
from wic.pluginbase import SourcePlugin
from wic.utils.misc import (exec_cmd, exec_native_cmd,
@@ -57,14 +56,13 @@ class BootimgPcbiosPlugin(SourcePlugin):
elif creator.ptable_format == 'gpt':
mbrfile += "gptmbr.bin"
else:
logger.error("Unsupported partition table: %s", creator.ptable_format)
sys.exit(1)
raise WicError("Unsupported partition table: %s" %
creator.ptable_format)
if not os.path.exists(mbrfile):
logger.error("Couldn't find %s. If using the -e option, do you "
"have the right MACHINE set in local.conf? If not, "
"is the bootimg_dir path correct?", mbrfile)
sys.exit(1)
raise WicError("Couldn't find %s. If using the -e option, do you "
"have the right MACHINE set in local.conf? If not, "
"is the bootimg_dir path correct?" % mbrfile)
full_path = creator._full_path(workdir, disk_name, "direct")
logger.debug("Installing MBR on disk %s as %s with size %s bytes",
@@ -152,11 +150,9 @@ class BootimgPcbiosPlugin(SourcePlugin):
if not _has_syslinux(bootimg_dir):
bootimg_dir = get_bitbake_var("STAGING_DATADIR", "wic-tools")
if not bootimg_dir:
logger.error("Couldn't find STAGING_DATADIR, exiting\n")
sys.exit(1)
raise WicError("Couldn't find STAGING_DATADIR, exiting")
if not _has_syslinux(bootimg_dir):
logger.error("Please build syslinux first\n")
sys.exit(1)
raise WicError("Please build syslinux first")
# just so the result notes display it
creator.bootimg_dir = bootimg_dir