deploy_chrome: Fix the case when nothing is mounted on target.
The conditional statement to check whether mount_dir is already mounted
and umount it if needed has a side effect of returning a non-zero exit
status, which when nothing is mounted will make RunCommand treat it as a
failure and as a result fail the whole deploy.
Fix this by adding || true to the conditional statement to make its
return status always 0.
BUG=None
TEST=deploy_chrome when nothing is mounted
Change-Id: I4e6f34592fa261353a965620699cb6aca073c18b
Reviewed-on: https://chromium-review.googlesource.com/237733
Trybot-Ready: Pawel Osciak <posciak@chromium.org>
Tested-by: Pawel Osciak <posciak@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Commit-Queue: Pawel Osciak <posciak@chromium.org>
diff --git a/scripts/deploy_chrome.py b/scripts/deploy_chrome.py
index 36befec..1cf01f4 100644
--- a/scripts/deploy_chrome.py
+++ b/scripts/deploy_chrome.py
@@ -65,7 +65,8 @@
_CHROME_DIR = '/opt/google/chrome'
_CHROME_DIR_MOUNT = '/mnt/stateful_partition/deploy_rootfs/opt/google/chrome'
-_UMOUNT_DIR_IF_MOUNTPOINT_CMD = 'mountpoint -q %(dir)s && umount %(dir)s'
+_UMOUNT_DIR_IF_MOUNTPOINT_CMD = (
+ 'if mountpoint -q %(dir)s; then umount %(dir)s; fi')
_BIND_TO_FINAL_DIR_CMD = 'mount --rbind %s %s'
_SET_MOUNT_FLAGS_CMD = 'mount -o remount,exec,suid %s'