summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Lublin <daniel@lublin.se>2017-05-30 13:17:59 +0200
committerBogdan Oprescu <bogdan.oprescu@enea.com>2023-10-19 12:20:55 +0200
commit0ca0a5e14b2897cc8df7539b4b576594363d519a (patch)
treec84cbbb09a34b99d89eefcbfcc8aa4e882284bc9
parentb0ede5088b2f4338ea5faf5db46d67eb1c7e8243 (diff)
downloadpoky-0ca0a5e14b2897cc8df7539b4b576594363d519a.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 b3730ae833..cdc7db0b29 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: