[oe-commits] Paul Eggleton : devtool: deploy-target: fix deploying to previously deployed machine

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: c938dee4b28af7e6296c86347dfa533f85605033
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=c938dee4b28af7e6296c86347dfa533f85605033

Author: Paul Eggleton <paul.eggleton at linux.intel.com>
Date:   Sun Mar  8 12:34:01 2015 +0000

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 at linux.intel.com>
Signed-off-by: Ross Burton <ross.burton at intel.com>

---

 scripts/lib/devtool/deploy.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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)