From 2a3a6932036f60a9f415f54b697abb944929db8f Mon Sep 17 00:00:00 2001 From: Nicolas Boichat Date: Thu, 5 Apr 2018 16:25:25 +0800 Subject: [PATCH] DO NOT MERGE: GetDevices: Also allow `\-` to be part of the host name Change-Id: Ib4eaa0f1ded74d8733f378675fe509cf5a6b1c2b --- android/scripts/common.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/scripts/common.py b/android/scripts/common.py index a158367..470666a 100644 --- a/android/scripts/common.py +++ b/android/scripts/common.py @@ -173,7 +173,7 @@ def getDevices (adb): if proc.returncode != 0: raise Exception("adb devices -l failed, got %d" % proc.returncode) - ptrn = re.compile(r'^([a-zA-Z0-9\.:]+)\s+.*product:([^\s]+)\s+model:([^\s]+)\s+device:([^\s]+)') + ptrn = re.compile(r'^([a-zA-Z0-9\.\-:]+)\s+.*product:([^\s]+)\s+model:([^\s]+)\s+device:([^\s]+)') devices = [] for line in stdout.splitlines()[1:]: if len(line.strip()) == 0: -- 2.7.4