[PATCH] WIC Error Handling is broken, no module named 'os_exit()' is available.

[Farhat]

From: Farhat-Abbas <Farhat...@mentor.com>

Signed-off-by: Farhat-Abbas <Farhat...@mentor.com>
---
scripts/lib/wic/plugins/source/efibootguard-boot.py | 4 ++--
scripts/lib/wic/plugins/source/efibootguard-efi.py | 3 ++-
2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/scripts/lib/wic/plugins/source/efibootguard-boot.py b/scripts/lib/wic/plugins/source/efibootguard-boot.py
index f4326ae..e32338c 100644
--- a/scripts/lib/wic/plugins/source/efibootguard-boot.py
+++ b/scripts/lib/wic/plugins/source/efibootguard-boot.py
@@ -30,6 +30,7 @@ import os
import shutil
import logging

+from wic import WicError
from wic.pluginbase import SourcePlugin
from wic.engine import get_custom_config
from wic.misc import exec_cmd, exec_native_cmd, get_bitbake_var, \
@@ -85,8 +86,7 @@ class EfibootguardBootPlugin(SourcePlugin):
if not kernel_dir:
kernel_dir = get_bitbake_var("DEPLOY_DIR_IMAGE")
if not kernel_dir:
- msger.error("DEPLOY_DIR_IMAGE not set, exiting\n")
- os.exit(1)
+ raise WicError("DEPLOY_DIR_IMAGE not set, exiting")

staging_kernel_dir = kernel_dir

diff --git a/scripts/lib/wic/plugins/source/efibootguard-efi.py b/scripts/lib/wic/plugins/source/efibootguard-efi.py
index 62e283a..30c789c 100644
--- a/scripts/lib/wic/plugins/source/efibootguard-efi.py
+++ b/scripts/lib/wic/plugins/source/efibootguard-efi.py
@@ -31,6 +31,7 @@ import os.path
import shutil
import logging

+from wic import WicError
from wic.pluginbase import SourcePlugin
from wic.engine import get_custom_config
from wic.misc import exec_cmd, exec_native_cmd, get_bitbake_var, \
@@ -58,7 +59,7 @@ class EfibootguardEFIPlugin(SourcePlugin):
if not kernel_dir:
kernel_dir = get_bitbake_var("DEPLOY_DIR_IMAGE")
if not kernel_dir:
- msger.error("DEPLOY_DIR_IMAGE not set, exiting\n")
+ raise WicError("DEPLOY_DIR_IMAGE not set, exiting")

staging_kernel_dir = kernel_dir

--
2.7.4