summaryrefslogtreecommitdiffstats
path: root/python-packages
diff options
context:
space:
mode:
authorSpencer Low <CompareAndSwap@gmail.com>2015-10-11 22:36:44 -0700
committerSpencer Low <CompareAndSwap@gmail.com>2015-10-11 22:36:44 -0700
commitebbc3fe2d075d77534b0ff4313db03234a18f117 (patch)
treed1391ea88fb5f1a988739e8da03482c95db27526 /python-packages
parentd427f1e5f538537b78361c1fc905e8694f1f85a1 (diff)
downloadandroid_development-ebbc3fe2d075d77534b0ff4313db03234a18f117.tar.gz
android_development-ebbc3fe2d075d77534b0ff4313db03234a18f117.tar.bz2
android_development-ebbc3fe2d075d77534b0ff4313db03234a18f117.zip
adb/test_device.py: fix finding md5 command on pre-L platforms
606835ae5c4b9519009cdff8b1c33169cff32cb1 in platform/system/core made adb.device.shell() throw adb.ShellError instead of subprocess.CalledProcessError. Change-Id: I7f579887a9aab8d11cbb2c419b8406f51d6b1bd6 Signed-off-by: Spencer Low <CompareAndSwap@gmail.com>
Diffstat (limited to 'python-packages')
-rw-r--r--python-packages/adb/test_device.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/python-packages/adb/test_device.py b/python-packages/adb/test_device.py
index a1e659fd9..20f8d17a0 100644
--- a/python-packages/adb/test_device.py
+++ b/python-packages/adb/test_device.py
@@ -383,7 +383,7 @@ def get_md5_prog(device):
try:
device.shell(['md5sum', '/proc/uptime'])
return 'md5sum'
- except subprocess.CalledProcessError:
+ except adb.ShellError:
return 'md5'