From 92e8c81c941597eb2b4b61d5c28833e4826888f8 Mon Sep 17 00:00:00 2001 From: Ed Bartosh Date: Tue, 14 Feb 2017 23:07:35 +0200 Subject: wic: raise WicError in wic plugins Replaced sys.exit with raising WicError in wic plugins. Signed-off-by: Ed Bartosh --- scripts/lib/wic/plugins/source/bootimg-efi.py | 32 ++++++++++----------------- 1 file changed, 12 insertions(+), 20 deletions(-) (limited to 'scripts/lib/wic/plugins/source/bootimg-efi.py') diff --git a/scripts/lib/wic/plugins/source/bootimg-efi.py b/scripts/lib/wic/plugins/source/bootimg-efi.py index e4c845129e..1f018fabf4 100644 --- a/scripts/lib/wic/plugins/source/bootimg-efi.py +++ b/scripts/lib/wic/plugins/source/bootimg-efi.py @@ -27,8 +27,8 @@ import logging import os import shutil -import sys +from wic.errors 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, @@ -59,9 +59,8 @@ class BootimgEFIPlugin(SourcePlugin): logger.debug("Using custom configuration file " "%s for grub.cfg", configfile) else: - logger.error("configfile is specified but failed to " - "get it from %s.", configfile) - sys.exit(1) + raise WicError("configfile is specified but failed to " + "get it from %s." % configfile) if not custom_cfg: # Create grub configuration using parameters from wks file @@ -108,8 +107,7 @@ class BootimgEFIPlugin(SourcePlugin): # obviously we need to have a common common deploy var bootimg_dir = get_bitbake_var("DEPLOY_DIR_IMAGE") if not bootimg_dir: - logger.error("Couldn't find DEPLOY_DIR_IMAGE, exiting\n") - sys.exit(1) + raise WicError("Couldn't find DEPLOY_DIR_IMAGE, exiting") cp_cmd = "cp %s/%s %s" % (bootimg_dir, initrd, hdddir) exec_cmd(cp_cmd, True) @@ -132,9 +130,8 @@ class BootimgEFIPlugin(SourcePlugin): logger.debug("Using custom configuration file " "%s for systemd-boots's boot.conf", configfile) else: - logger.error("configfile is specified but failed to " - "get it from %s.", configfile) - sys.exit(1) + raise WicError("configfile is specified but failed to " + "get it from %s.", configfile) if not custom_cfg: # Create systemd-boot configuration using parameters from wks file @@ -174,11 +171,9 @@ class BootimgEFIPlugin(SourcePlugin): elif source_params['loader'] == 'systemd-boot': cls.do_configure_systemdboot(hdddir, creator, cr_workdir, source_params) else: - logger.error("unrecognized bootimg-efi loader: %s", source_params['loader']) - sys.exit(1) + raise WicError("unrecognized bootimg-efi loader: %s" % source_params['loader']) except KeyError: - logger.error("bootimg-efi requires a loader, none specified") - sys.exit(1) + raise WicError("bootimg-efi requires a loader, none specified") @classmethod @@ -193,8 +188,7 @@ class BootimgEFIPlugin(SourcePlugin): if not bootimg_dir: bootimg_dir = get_bitbake_var("DEPLOY_DIR_IMAGE") if not bootimg_dir: - logger.error("Couldn't find DEPLOY_DIR_IMAGE, exiting\n") - sys.exit(1) + raise WicError("Couldn't find DEPLOY_DIR_IMAGE, exiting") # just so the result notes display it creator.bootimg_dir = bootimg_dir @@ -221,12 +215,10 @@ class BootimgEFIPlugin(SourcePlugin): cp_cmd = "cp %s/%s %s/EFI/BOOT/%s" % (bootimg_dir, mod, hdddir, mod[8:]) exec_cmd(cp_cmd, True) else: - logger.error("unrecognized bootimg-efi loader: %s", - source_params['loader']) - sys.exit(1) + raise WicError("unrecognized bootimg-efi loader: %s" % + source_params['loader']) except KeyError: - logger.error("bootimg-efi requires a loader, none specified") - sys.exit(1) + raise WicError("bootimg-efi requires a loader, none specified") startup = os.path.join(bootimg_dir, "startup.nsh") if os.path.exists(startup): -- cgit 1.2.3-korg