build/android/adb_logcat_monitor.py - Issue 661843003: Fixed extraction of emulated devices name

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: build/android/adb_logcat_monitor.py

Issue 661843003: Fixed extraction of emulated devices name (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: build/android/adb_logcat_monitor.py

diff --git a/build/android/adb_logcat_monitor.py b/build/android/adb_logcat_monitor.py

index a2acfd1520b69e3aef0bed4309636bab214fcb9b..a5ae785585f5e3c709b917fe83b24e47163578f3 100755

--- a/build/android/adb_logcat_monitor.py

+++ b/build/android/adb_logcat_monitor.py

@@ -83,7 +83,7 @@ def GetAttachedDevices(adb_cmd):

stderr=subprocess.PIPE).communicate()

if err:

logging.warning('adb device error %s', err.strip())

- return re.findall('^(\w+)\tdevice$', out, re.MULTILINE)

+ return re.findall('^(\S+)\tdevice$', out, re.MULTILINE)

except TimeoutException:

logging.warning('"adb devices" command timed out')

return []

« no previous file with comments | « no previous file | build/android/adb_logcat_printer.py » ('j') | no next file with comments »