summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorperezju <perezju@chromium.org>2016-02-01 07:46:00 -0800
committerCommit bot <commit-bot@chromium.org>2016-02-01 15:46:46 +0000
commitda2e943a581570f88ab20adcc78208c17344959d (patch)
treeb7348e5296b538636cfc643f86ded31bf6bd3974 /build
parentfe111da6543cdcc3aaa9c8f88a87e0ec296f703f (diff)
downloadchromium_src-da2e943a581570f88ab20adcc78208c17344959d.zip
chromium_src-da2e943a581570f88ab20adcc78208c17344959d.tar.gz
chromium_src-da2e943a581570f88ab20adcc78208c17344959d.tar.bz2
[build/android] Clearer output for adb_command_line.py
When printing current flags use the string repr (i.e. quoted), so it's easier to understand the output in the case of empty/missing flags. BUG=580585 Review URL: https://codereview.chromium.org/1657603003 Cr-Commit-Position: refs/heads/master@{#372665}
Diffstat (limited to 'build')
-rwxr-xr-xbuild/android/adb_command_line.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/build/android/adb_command_line.py b/build/android/adb_command_line.py
index 57882fb..a74094d 100755
--- a/build/android/adb_command_line.py
+++ b/build/android/adb_command_line.py
@@ -46,14 +46,14 @@ Otherwise: Writes command-line file.
def print_args():
def read_flags(device):
try:
- return device.ReadFile(args.device_path, as_root=as_root)
+ return device.ReadFile(args.device_path, as_root=as_root).rstrip()
except device_errors.AdbCommandFailedError:
- return '\n' # File might not exist.
+ return '' # File might not exist.
descriptions = all_devices.pMap(lambda d: d.build_description).pGet(None)
flags = all_devices.pMap(read_flags).pGet(None)
for d, desc, flags in zip(devices, descriptions, flags):
- print ' %s (%s): %s' % (d, desc, flags),
+ print ' %s (%s): %r' % (d, desc, flags)
# No args == print flags.
if not remote_args: