[gnome-continuous-yocto/gnomeostree-3.28-rocko: 6076/8267] devtool: deploy-target: Let script continue even if rm fails

[Emmanuele Bassi <ebassi src gnome org>]

commit 693878a3e9fdc7ed79e7de258ec9927440b0561a
Author: Daniel Lublin <daniel lublin se>
Date:   Tue May 30 13:17:59 2017 +0200

    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>

 scripts/lib/devtool/deploy.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/scripts/lib/devtool/deploy.py b/scripts/lib/devtool/deploy.py
index d181135..04c34cb 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: