mojo/devtools/common/devtoolslib/shell_arguments.py - Issue 1438123003: Fix `--verbose` handling in android_shell.

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: mojo/devtools/common/devtoolslib/shell_arguments.py

Issue 1438123003: Fix `--verbose` handling in android_shell. (Closed) Base URL: git@github.com:domokit/mojo.git@master

Patch Set: Don't mix stdout w/ stderr. Created 5 years, 1 month 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: mojo/devtools/common/devtoolslib/shell_arguments.py

diff --git a/mojo/devtools/common/devtoolslib/shell_arguments.py b/mojo/devtools/common/devtoolslib/shell_arguments.py

index 024ee5107a628c39f8eeb82eef19124f2a4c4bf2..5ee28b2bd40d06b98b313ea9665b2c47e25c49ab 100644

--- a/mojo/devtools/common/devtoolslib/shell_arguments.py

+++ b/mojo/devtools/common/devtoolslib/shell_arguments.py

@@ -9,7 +9,6 @@ shell_config.ShellConfig.

"""

import os.path

-import sys

import urlparse

from devtoolslib.android_shell import AndroidShell

@@ -195,11 +194,9 @@ def get_shell(shell_config, shell_args):

ShellConfigurationException if shell abstraction could not be configured.

"""

if shell_config.android:

- verbose_pipe = sys.stdout if shell_config.verbose else None

shell = AndroidShell(shell_config.adb_path, shell_config.target_device,

logcat_tags=shell_config.logcat_tags,

- verbose_pipe=verbose_pipe)

+ verbose=shell_config.verbose)

device_status, error = shell.check_device(

require_root=shell_config.require_root)