diff options
| author | Ruben Rodriguez Buchillon <coconutruben@chromium.org> | 2019-02-22 03:44:28 +0800 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2019-03-28 11:17:20 -0700 |
| commit | b2a0700cf9a3fd50e86932e56513471bfcd5e618 (patch) | |
| tree | dd2c7aa20382df0df915fd2639d30999c3b4f0c7 /extra | |
| parent | 088bc355601bea788a180e806a2fc9d2e5e6d9c1 (diff) | |
| download | chrome-ec-b2a0700cf9a3fd50e86932e56513471bfcd5e618.tar.gz | |
servo_updater: make regex more robust
Seen some logs where due to the regex cutting out too soon, the
servo_updater assumes an update might be needed whereas the version on
the v4/micro is actually already up to date.
This change tightens the regex used to query the version by requiring it
to match some sort of newline character after the version string as
well.
BRANCH=None
BUG=chromium:933978
TEST=manual testing
sudo servod_updater
[observe it working well]
Change-Id: I0b3139a120087d49d6f4bd52267d191716d3b541
Signed-off-by: Ruben Rodriguez Buchillon <coconutruben@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/1481770
Commit-Ready: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com>
Reviewed-by: Matthew Blecker <matthewb@chromium.org>
Diffstat (limited to 'extra')
| -rwxr-xr-x | extra/usb_updater/servo_updater.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/extra/usb_updater/servo_updater.py b/extra/usb_updater/servo_updater.py index 136cfaf820..68a920ec1b 100755 --- a/extra/usb_updater/servo_updater.py +++ b/extra/usb_updater/servo_updater.py @@ -110,7 +110,7 @@ def do_version(vidpid, iface, serialno): pty = connect(vidpid, iface, serialno) cmd = '\r\nversion\r\n' - regex = 'Build:\s+(\S+)' + regex = 'Build:\s+(\S+)[\r\n]+' results = pty._issue_cmd_get_results(cmd, [regex])[0] pty.close() |