aboutsummaryrefslogtreecommitdiffstats
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:43:28 +0100
commitdb54c9a22a9b66c673df8e836de5e47fc9edda0b (patch)
treeceb0d326ffc97a84f53b8f5f4e4096640dee551d
parent061f2aab40fecbfe0dcb928baa95d6b3a6b45eed (diff)
downloadopenembedded-core-db54c9a22a9b66c673df8e836de5e47fc9edda0b.tar.gz
openembedded-core-db54c9a22a9b66c673df8e836de5e47fc9edda0b.tar.bz2
openembedded-core-db54c9a22a9b66c673df8e836de5e47fc9edda0b.zip
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. Signed-off-by: Daniel Lublin <daniel@lublin.se> Signed-off-by: Ross Burton <ross.burton@intel.com>
-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
lines.append(' rmdir $file > /dev/null 2>&1 || true')
lines.append(' fi')
lines.append(' else')
- lines.append(' rm $file')
+ lines.append(' rm -f $file')
lines.append(' fi')
lines.append(' done')
if not dryrun: