diff options
| author | Josh Gao <jmgao@google.com> | 2015-10-22 01:05:59 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-10-22 01:05:59 +0000 |
| commit | a80834e943292c4c8f1366f8133908576b32373c (patch) | |
| tree | 5362c1a3cb8574b5d7a2f7b8b9a95cde0cd66461 /python-packages | |
| parent | 644db98ff21e5499ce3e1f89338881e89e750261 (diff) | |
| parent | ebbc3fe2d075d77534b0ff4313db03234a18f117 (diff) | |
| download | android_development-a80834e943292c4c8f1366f8133908576b32373c.tar.gz android_development-a80834e943292c4c8f1366f8133908576b32373c.tar.bz2 android_development-a80834e943292c4c8f1366f8133908576b32373c.zip | |
Merge "adb/test_device.py: fix finding md5 command on pre-L platforms"
Diffstat (limited to 'python-packages')
| -rw-r--r-- | python-packages/adb/test_device.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/python-packages/adb/test_device.py b/python-packages/adb/test_device.py index c4f7f36e4..5d11ddc20 100644 --- a/python-packages/adb/test_device.py +++ b/python-packages/adb/test_device.py @@ -404,7 +404,7 @@ def get_md5_prog(device): try: device.shell(['md5sum', '/proc/uptime']) return 'md5sum' - except subprocess.CalledProcessError: + except adb.ShellError: return 'md5' |