From 07f76656d907a941f1bc18ad37599799b1ff271a Mon Sep 17 00:00:00 2001 From: Markus Lehtonen Date: Wed, 27 May 2015 17:59:09 +0300 Subject: devtool: use DevtoolError for error handling Use DevtoolError exception more widely for handling error cases. This exception is now caught in the main script and raising it can be used to exit with an error. This hopefully simplifies error handling. The change also makes exit codes more consistent, always returning '1' when an error occurs. (From OE-Core rev: 2e4f1dcade7ccb581c7a390c32163ea3deeac6d5) Signed-off-by: Markus Lehtonen Signed-off-by: Richard Purdie --- scripts/devtool | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'scripts/devtool') diff --git a/scripts/devtool b/scripts/devtool index fd4af9838a..fa799f6a06 100755 --- a/scripts/devtool +++ b/scripts/devtool @@ -35,6 +35,7 @@ context = None scripts_path = os.path.dirname(os.path.realpath(__file__)) lib_path = scripts_path + '/lib' sys.path = sys.path + [lib_path] +from devtool import DevtoolError import scriptutils logger = scriptutils.logger_create('devtool') @@ -250,7 +251,12 @@ def main(): if args.subparser_name != 'create-workspace': read_workspace() - ret = args.func(args, config, basepath, workspace) + try: + ret = args.func(args, config, basepath, workspace) + except DevtoolError as err: + if str(err): + logger.error(str(err)) + ret = 1 return ret -- cgit v1.2.3-54-g00ecf