From: Ed Bartosh <ed.bartosh@linux.intel.com>
Date: Mon, 18 Jan 2016 12:22:42 +0000 (+0200)
Subject: wic: catch KickStartError
X-Git-Tag: yocto-4.0~23180
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9c058f115583592f5cce2a969882fdd0c2ab535f;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

wic: catch KickStartError

Catch parsing errors and output them using msger.

Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/scripts/lib/wic/conf.py b/scripts/lib/wic/conf.py
index 2e2945130c4..922a0f68e64 100644
--- a/scripts/lib/wic/conf.py
+++ b/scripts/lib/wic/conf.py
@@ -17,7 +17,7 @@
 
 import os
 
-from wic.kickstart import KickStart
+from wic.kickstart import KickStart, KickStartError
 from wic import msger
 from wic.utils import misc
 
@@ -87,7 +87,10 @@ class ConfigMgr(object):
         if not ksconf:
             return
 
-        ksobj = KickStart(ksconf)
+        try:
+            ksobj = KickStart(ksconf)
+        except KickStartError as err:
+            msger.error(str(err))
 
         self.create['ks'] = ksobj
         self.create['name'] = os.path.splitext(os.path.basename(ksconf))[0]