Caught argparse.ArgumentError Included .ks file name and line number into the error messages.
Signed-off-by: Ed Bartosh <[email protected]> --- scripts/lib/wic/kickstart.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/scripts/lib/wic/kickstart.py b/scripts/lib/wic/kickstart.py index 7f0105d..5d3a572 100644 --- a/scripts/lib/wic/kickstart.py +++ b/scripts/lib/wic/kickstart.py @@ -27,7 +27,7 @@ import shlex -from argparse import ArgumentParser, ArgumentTypeError +from argparse import ArgumentParser, ArgumentError, ArgumentTypeError from wic.partition import Partition @@ -113,11 +113,16 @@ class KickStart(object): line = line.strip() lineno += 1 if line and line[0] != '#': - parsed = parser.parse_args(shlex.split(line)) + try: + parsed = parser.parse_args(shlex.split(line)) + except ArgumentError as err: + raise KickStartError('%s:%d: %s' % \ + (confpath, lineno, err)) if line.startswith('part'): self.partitions.append(Partition(parsed, lineno)) else: if not self.bootloader: self.bootloader = parsed else: - raise KickStartError("Error: more than one bootloader specified") + raise KickStartError("%s:%d: more than one bootloader "\ + "specified" % (confpath, lineno)) -- 2.1.4 -- _______________________________________________ Openembedded-core mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-core
