commit b734d58a01b56e40ae932319eb71d81bded55f6f
author Katherine Threlkeld <kathrelkeld@chromium.org> Wed Jun 29 11:45:07 2016 -0700
committer chrome-bot <chrome-bot@chromium.org> Fri Jul 01 05:16:47 2016 -0700
tree 5d6a0265b610aa2a3be8fb19371e1772d22fc2a0
parent aeae673cc06d857bf34b35a5a81f07ad8ec877d2

[Provingground] Make touch_firmware_versions handle umaro.

Allow variables without ' or " around their values.
Make same exception as exists for lulu due to a typo.

BUG=None
TEST=same output as before, except umaro is included now

Change-Id: I3a5e222294c662b2e0c98b725bce24482c66a6ab
Reviewed-on: https://chromium-review.googlesource.com/357160
Commit-Ready: Katherine Threlkeld <kathrelkeld@chromium.org>
Tested-by: Katherine Threlkeld <kathrelkeld@chromium.org>
Reviewed-by: Charlie Mooney <charliemooney@chromium.org>

provingground/touch_firmware_versions.py

diff --git a/provingground/touch_firmware_versions.py b/provingground/touch_firmware_versions.py
index 83abef3..b91bc49 100755
--- a/provingground/touch_firmware_versions.py
+++ b/provingground/touch_firmware_versions.py
@@ -48,7 +48,7 @@
   Returns:
     A string of the value or '' if not found.
   """
-  result = re.findall(r'^%s=["\'](.*)["\']' % var, text, re.MULTILINE)
+  result = re.findall(r'^%s=["\']?(.*?)["\']?\n' % var, text, re.MULTILINE)
   if not result:
     return ''
   return result[-1]
@@ -116,7 +116,7 @@
       fw_file = search.group(1)
 
   # Exceptions for unfortunately formatted files.
-  if device == 'lulu' and fw_file == '':
+  if (device == 'lulu' or device == 'umaro') and fw_file == '':
     bad_fmt = 'SYNA_TP_SYM_LINK_PATH=}'
     good_fmt = bad_fmt.replace('=', '')
     new_line = list(line)