From 9e665f2fae1f4b4ae6d6a262775b4e5f7e0c3732 Mon Sep 17 00:00:00 2001 From: Paul Idstein Date: Mon, 17 Dec 2018 14:00:14 +0100 Subject: [PATCH] Support ADB IP devices Regex will not match ADB IP devices. --- tools/sh_commands.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/sh_commands.py b/tools/sh_commands.py index 4be75b79..a824ba57 100644 --- a/tools/sh_commands.py +++ b/tools/sh_commands.py @@ -111,7 +111,7 @@ def clear_phone_data_dir(serialno, phone_data_dir): ################################ def adb_devices(): serialnos = [] - p = re.compile(r'([\w|-]+)\s+device') + p = re.compile(r'(\S+)\s+device') for line in split_stdout(sh.adb("devices")): m = p.match(line) if m: -- GitLab