From: Daniel Lublin Date: Tue, 30 May 2017 11:17:59 +0000 (+0200) Subject: devtool: deploy-target: Let script continue even if rm fails X-Git-Tag: uninative-1.7~690 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=db54c9a22a9b66c673df8e836de5e47fc9edda0b;p=openembedded-core.git 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 Signed-off-by: Ross Burton --- 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: