| Index: build/android/pylib/device/adb_wrapper.py
|
| diff --git a/build/android/pylib/device/adb_wrapper.py b/build/android/pylib/device/adb_wrapper.py
|
| index e73d66c9a7c8efe0dbe0c445e7cf61b893ae1591..39fe706b0bc734262f5b82cf55cfe881660d14d7 100644
|
| --- a/build/android/pylib/device/adb_wrapper.py
|
| +++ b/build/android/pylib/device/adb_wrapper.py
|
| @@ -161,8 +161,13 @@ class AdbWrapper(object):
|
| timeout: (optional) Timeout per try in seconds.
|
| retries: (optional) Number of retries to attempt.
|
| """
|
| - self._RunDeviceAdbCmd(['pull', remote, local], timeout, retries)
|
| - _VerifyLocalFileExists(local)
|
| + cmd = ['pull', remote, local]
|
| + self._RunDeviceAdbCmd(cmd, timeout, retries)
|
| + try:
|
| + _VerifyLocalFileExists(local)
|
| + except IOError:
|
| + raise device_errors.AdbCommandFailedError(
|
| + cmd, 'File not found on host: %s' % local, device_serial=str(self))
|
|
|
| def Shell(self, command, expect_status=0, timeout=_DEFAULT_TIMEOUT,
|
| retries=_DEFAULT_RETRIES):
|
|
|