| Index: build/android/buildbot/bb_device_status_check.py
|
| diff --git a/build/android/buildbot/bb_device_status_check.py b/build/android/buildbot/bb_device_status_check.py
|
| index 1a238de9a054febd12cfde75b76b53d6016eaf5e..228c48162404d3962179f7e954d0fa1e84d3b2d0 100755
|
| --- a/build/android/buildbot/bb_device_status_check.py
|
| +++ b/build/android/buildbot/bb_device_status_check.py
|
| @@ -246,7 +246,7 @@ def KillAllAdb():
|
| try:
|
| if 'adb' in p.name:
|
| yield p
|
| - except psutil.error.NoSuchProcess:
|
| + except (psutil.error.NoSuchProcess, psutil.error.AccessDenied):
|
| pass
|
|
|
| for sig in [signal.SIGTERM, signal.SIGQUIT, signal.SIGKILL]:
|
| @@ -255,12 +255,12 @@ def KillAllAdb():
|
| print 'kill %d %d (%s [%s])' % (sig, p.pid, p.name,
|
| ' '.join(p.cmdline))
|
| p.send_signal(sig)
|
| - except psutil.error.NoSuchProcess:
|
| + except (psutil.error.NoSuchProcess, psutil.error.AccessDenied):
|
| pass
|
| for p in GetAllAdb():
|
| try:
|
| print 'Unable to kill %d (%s [%s])' % (p.pid, p.name, ' '.join(p.cmdline))
|
| - except psutil.error.NoSuchProcess:
|
| + except (psutil.error.NoSuchProcess, psutil.error.AccessDenied):
|
| pass
|
|
|
|
|
|
|