]> code.ossystems Code Review - openembedded-core.git/commitdiff
wic: catch KickStartError
authorEd Bartosh <ed.bartosh@linux.intel.com>
Mon, 18 Jan 2016 12:22:42 +0000 (14:22 +0200)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Tue, 19 Jan 2016 16:35:37 +0000 (16:35 +0000)
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>
scripts/lib/wic/conf.py

index 2e2945130c458c663197d821771b6f9ebe0b3bf0..922a0f68e6484cc53c88632625b3cbb1465a1826 100644 (file)
@@ -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]