diff options
| author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2015-03-08 12:34:01 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-03-20 11:03:10 +0000 |
| commit | c938dee4b28af7e6296c86347dfa533f85605033 (patch) | |
| tree | 146bf4986c2788671353ba3f80f93026e317f24d /scripts | |
| parent | 58548081b15f37452b71c135d5aa8cbbda5b1b61 (diff) | |
| download | openembedded-core-c938dee4b28af7e6296c86347dfa533f85605033.tar.gz openembedded-core-c938dee4b28af7e6296c86347dfa533f85605033.tar.bz2 openembedded-core-c938dee4b28af7e6296c86347dfa533f85605033.zip | |
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
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/lib/devtool/deploy.py | 4 |
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): 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) |