From 4424440f42a537772e9505457a78bfe6a957ce2d Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Sun, 8 Mar 2015 12:34:01 +0000 Subject: devtool: deploy-target: fix deploying to previously deployed machine * Pass correct arguments to undeploy() function * If an error occurs during undeploy(), exit instead of continuing (From OE-Core rev: c938dee4b28af7e6296c86347dfa533f85605033) Signed-off-by: Paul Eggleton Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- scripts/lib/devtool/deploy.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'scripts') diff --git a/scripts/lib/devtool/deploy.py b/scripts/lib/devtool/deploy.py index bd23e95..896b618 100644 --- a/scripts/lib/devtool/deploy.py +++ b/scripts/lib/devtool/deploy.py @@ -44,7 +44,9 @@ def deploy(args, config, basepath, workspace): deploy_file = os.path.join(deploy_dir, args.recipename + '.list') if os.path.exists(deploy_file): - undeploy(args) + if undeploy(args, config, basepath, workspace): + # Error already shown + return -1 stdout, stderr = exec_build_env_command(config.init_path, basepath, 'bitbake -e %s' % args.recipename, shell=True) recipe_outdir = re.search(r'^D="(.*)"', stdout, re.MULTILINE).group(1) -- cgit v1.1