summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2015-03-08 12:34:01 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-03-20 11:27:43 +0000
commit4424440f42a537772e9505457a78bfe6a957ce2d (patch)
tree1e45edcbca531dcc573ee40e4e7d6b8ee735791c
parentbe6289f4af5a2dbd325da6cf92e1a4793cf75886 (diff)
downloadpoky-4424440f42a537772e9505457a78bfe6a957ce2d.tar.gz
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 <paul.eggleton@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--scripts/lib/devtool/deploy.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/scripts/lib/devtool/deploy.py b/scripts/lib/devtool/deploy.py
index bd23e95dd9..896b618e80 100644
--- a/scripts/lib/devtool/deploy.py
+++ b/scripts/lib/devtool/deploy.py
@@ -44,7 +44,9 @@ def deploy(args, config, basepath, workspace):
44 deploy_file = os.path.join(deploy_dir, args.recipename + '.list') 44 deploy_file = os.path.join(deploy_dir, args.recipename + '.list')
45 45
46 if os.path.exists(deploy_file): 46 if os.path.exists(deploy_file):
47 undeploy(args) 47 if undeploy(args, config, basepath, workspace):
48 # Error already shown
49 return -1
48 50
49 stdout, stderr = exec_build_env_command(config.init_path, basepath, 'bitbake -e %s' % args.recipename, shell=True) 51 stdout, stderr = exec_build_env_command(config.init_path, basepath, 'bitbake -e %s' % args.recipename, shell=True)
50 recipe_outdir = re.search(r'^D="(.*)"', stdout, re.MULTILINE).group(1) 52 recipe_outdir = re.search(r'^D="(.*)"', stdout, re.MULTILINE).group(1)