diff options
| author |   Ed Bartosh <ed.bartosh@linux.intel.com> | 2016-01-18 14:22:42 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-01-19 17:24:47 +0000 |
| commit | 1ed97cc886832047945c18e13ea098c775c7f2cc (patch) | |
| tree | 4a8bd0e02bad8cb1ab799e8cfe3a1831cf31c2cd | |
| parent | bda77fd50684c32e464bf2e03376c46d41cabbdc (diff) | |
| download | openembedded-core-contrib-1ed97cc886832047945c18e13ea098c775c7f2cc.tar.gz | |
wic: catch KickStartError
Catch parsing errors and output them using msger.
(From OE-Core rev: 9c058f115583592f5cce2a969882fdd0c2ab535f)
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | scripts/lib/wic/conf.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/scripts/lib/wic/conf.py b/scripts/lib/wic/conf.py index 2e2945130c..922a0f68e6 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] |