commit 2535686c322c053379e43c38b6c71bf881e2eeca
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Feb 18 21:24:00 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Feb 18 21:24:00 2020 +0000
tree 1ed681d81af77d8f78e75352f56c0e87202e63b0
parent 86353f62d0621997002bc3c059f1336827371d8e
parent 53303a6b5143c9266891e632d0f5d7a66410c336

FAFT: Improved firmware image extraction during provisioning am: cf7ac14ea6 am: 53303a6b51

Change-Id: I32e017d23180a2041960d10df6c8e614e32b96a0

server/cros/servo/servo.py

diff --git a/server/cros/servo/servo.py b/server/cros/servo/servo.py
index 8a65923..07d7ee6 100644
--- a/server/cros/servo/servo.py
+++ b/server/cros/servo/servo.py
@@ -53,13 +53,19 @@
     if not os.path.exists(dest_dir):
         os.mkdir(dest_dir)
 
-    # Try to extract image candidates from tarball
+    # Generate a list of all tarball files
+    tarball_files = server_utils.system_output(
+        ('tar tf %s' % tarball), timeout=120, ignore_status=True).splitlines()
+
+    # Check if image candidates are in the list of tarball files
     for image in image_candidates:
-        status = server_utils.system(
+        if image in tarball_files:
+            # Extract and return the first image candidate found
+            status = server_utils.system(
                 ('tar xf %s -C %s %s' % (tarball, dest_dir, image)),
                 timeout=120, ignore_status=True)
-        if status == 0:
-            return image
+            if status == 0:
+                return image
     return None