commit e549c5ee4cdb358ed0f7e198ad0034b6adc0d4e9
author Billy Lau <billylau@google.com> Wed Mar 31 18:17:14 2021 -0700
committer Billy Lau <billylau@google.com> Wed Mar 31 18:17:14 2021 -0700
tree 7c5b64c636a0057032f1216b50b42942352825b4
parent 257e897c7611dcf0eb947554d7bbe5ef6a67edd4

Fix build fingerprint regex used by pixel_factory_image_verify.py

Bug: 184208838

Previously pixel_factory_image_verify.py was relying on a specific
property name to extract build fingerprint from system.img. But,
the property name has been updated in newer builds, causing the
build fingerprint extraction method to fail. This patch fixes
the regex.

Test: Ran the script on older build releases on crosshatch and
latest build on bramble, and they all work now.

Change-Id: Ib5faeaa5bfcd09668ae015d68ef2c3af7639ef1e

tools/transparency/pixel_factory_image_verify.py

diff --git a/tools/transparency/pixel_factory_image_verify.py b/tools/transparency/pixel_factory_image_verify.py
index 4479789..8e1069d 100755
--- a/tools/transparency/pixel_factory_image_verify.py
+++ b/tools/transparency/pixel_factory_image_verify.py
@@ -276,7 +276,7 @@
     """Extracts the build fingerprint from the system.img.
     Args:
       image_dir: The folder containing the unpacked factory image partitions,
-	    which contains a vbmeta.img patition.
+        which contains a vbmeta.img patition.
 
     Returns:
       The build fingerprint string, e.g.
@@ -285,7 +285,7 @@
     os.chdir(image_dir)
     args = ['grep',
             '-a',
-            'ro\.build\.fingerprint=google/.*/release-keys',
+            'ro\..*build\.fingerprint=google/.*/release-keys',
             'system.img']
 
     result, output = self._run_command(