summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Lublin <daniel@lublin.se>2017-05-30 13:17:59 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-06-03 23:46:06 +0100
commit693878a3e9fdc7ed79e7de258ec9927440b0561a (patch)
tree3b7d8f4e7e170be9a9dace97dfee690751c85ff6
parent1deb4a00ba049e9d13c7991e5fba867b590d2c43 (diff)
downloadpoky-693878a3e9fdc7ed79e7de258ec9927440b0561a.tar.gz
devtool: deploy-target: Let script continue even if rm fails
The remote script is run with `set -e`, so doing rm without -f on a $file that is already gone will exit the whole script, failing any redeployment. Assume a use case where packages sometimes produces certain test binaries stored on volatile media (tmpfs), and where the system is occasionally rebooted. (From OE-Core rev: db54c9a22a9b66c673df8e836de5e47fc9edda0b) Signed-off-by: Daniel Lublin <daniel@lublin.se> 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.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/lib/devtool/deploy.py b/scripts/lib/devtool/deploy.py
index d181135a9d..04c34cb016 100644
--- a/scripts/lib/devtool/deploy.py
+++ b/scripts/lib/devtool/deploy.py
@@ -64,7 +64,7 @@ def _prepare_remote_script(deploy, verbose=False, dryrun=False, undeployall=Fals
64 lines.append(' rmdir $file > /dev/null 2>&1 || true') 64 lines.append(' rmdir $file > /dev/null 2>&1 || true')
65 lines.append(' fi') 65 lines.append(' fi')
66 lines.append(' else') 66 lines.append(' else')
67 lines.append(' rm $file') 67 lines.append(' rm -f $file')
68 lines.append(' fi') 68 lines.append(' fi')
69 lines.append(' done') 69 lines.append(' done')
70 if not dryrun: 70 if not dryrun: