Index: build/android/pylib/device/device_errors.py |
diff --git a/build/android/pylib/device/device_errors.py b/build/android/pylib/device/device_errors.py |
index 66a226ca5206e590c66732192b03ce4af8a95368..e94968f146ad3256edbaa67460b79cdf410ee33f 100644 |
--- a/build/android/pylib/device/device_errors.py |
+++ b/build/android/pylib/device/device_errors.py |
@@ -59,7 +59,11 @@ class AdbShellCommandFailedError(AdbCommandFailedError): |
message.append(' exit status: %s\n' % status) |
if output: |
message.append(' output:\n') |
- message.extend(' - %s\n' % line for line in output.splitlines()) |
+ if isinstance(output, basestring): |
+ output_lines = output.splitlines() |
+ else: |
+ output_lines = output |
+ message.extend(' - %s\n' % line for line in output_lines) |
else: |
message.append(" output: ''\n") |
message = ''.join(message) |