From ed852bf5575be3a1865cf436db5b65eab3026b23 Mon Sep 17 00:00:00 2001 From: Kalle Raita Date: Tue, 20 Dec 2016 13:38:32 -0800 Subject: [PATCH] resolve merge conflicts of b6d3261 to nyc-mr1-dev-plus-aosp Test: Tried to run the install script locally Change-Id: I2c34fa110c811741ad53bd42143bfd2a371b459a --- 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 7940f4a..ef52764 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