From 1db6f52e721ad6c970f1907bfe053221eca43e6d Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Tue, 17 Dec 2024 15:07:01 +0100 Subject: [PATCH] oe-setup-build: raise exceptions on errors Otherwise the tool simply prints what went wrong and exits without error, which makes it impossible for tools like bitbake-setup to determine that the requested operation did not succeed. (From OE-Core rev: d44ab1c3abb25ef08307558430d76a47cde07cc1) Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- scripts/oe-setup-build | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/scripts/oe-setup-build b/scripts/oe-setup-build index 80d8c70bac..49603d9fd1 100755 --- a/scripts/oe-setup-build +++ b/scripts/oe-setup-build @@ -18,8 +18,7 @@ def makebuildpath(topdir, template): def discover_templates(layers_file): if not os.path.exists(layers_file): - print("List of layers {} does not exist; were the layers set up using the setup-layers script?".format(layers_file)) - return None + raise Exception("List of layers {} does not exist; were the layers set up using the setup-layers script or bitbake-setup tool?".format(layers_file)) templates = [] layers_list = json.load(open(layers_file))["layers"] @@ -77,8 +76,7 @@ def find_template(template_name, templates): for t in templates: if t["templatename"] == template_name: return t - print("Configuration {} is not one of {}, please try again.".format(template_name, [t["templatename"] for t in templates])) - return None + raise Exception("Configuration {} is not one of {}, please try again.".format(template_name, [t["templatename"] for t in templates])) def setup_build_env(args): templates = discover_templates(args.layerlist)