commit 6b7e973500e4a093e9c130cea63af750459dbe9c
author Mike Frysinger <vapier@chromium.org> Tue Jan 26 19:59:28 2021 -0500
committer Commit Bot <commit-bot@chromium.org> Wed Jan 27 23:34:27 2021 +0000
tree 0f65cc687dbe0f3fa177dc2bb04f21b2fc7b1da4
parent 5d75458f45e3d496c97891064a4d1126baab9d4b

cros deploy: optimize installed package check

Avoid sshing to the DUT twice as each one is not cheap.

BUG=None
TEST=`cros deploy` with uninstalled & installed packages still work

Change-Id: I7b5ae55edf0023e731e75484b2163e4706c3823d
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/2651158
Reviewed-by: Jae Hoon Kim <kimjae@chromium.org>
Commit-Queue: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>

cli/deploy.py

diff --git a/cli/deploy.py b/cli/deploy.py
index f677fcf..9f04443 100644
--- a/cli/deploy.py
+++ b/cli/deploy.py
@@ -1073,12 +1073,13 @@
   if from_dut:
     # On DUT, |pkg_path| is the directory which contains environment file.
     environment_path = os.path.join(pkg_path, _ENVIRONMENT_FILENAME)
-    result = device.run(['test', '-f', environment_path],
-                        check=False, encoding=None)
-    if result.returncode == 1:
+    result = device.run(['bzip2', '-d', '-c', environment_path], check=False,
+                        encoding=None)
+    if result.returncode:
       # The package is not installed on DUT yet. Skip extracting info.
-      return None, None
-    result = device.run(['bzip2', '-d', '-c', environment_path], encoding=None)
+      if not result.stdout and b'No such file or directory' in result.stderr:
+        return None, None
+      result.check_returncode()
     environment_content = result.output
   else:
     # On host, pkg_path is tbz2 file which contains environment file.