Commit 1a1f95be authored by a.kotkavuo's avatar a.kotkavuo Committed by Commit bot

Remove references to psutil.error in Android Buildbot scripts

The error module is not a part of psutil's API and it has been moved
to _error in recent releases. The exceptions in psutil are supposed to
be accessed directly from the top level module.

BUG=406396
R=frankf@chromium.org

Review URL: https://codereview.chromium.org/497763002

Cr-Commit-Position: refs/heads/master@{#300724}
parent 2fcb4c34
......@@ -19,6 +19,7 @@ Adenilson Cavalcanti <a.cavalcanti@samsung.com>
Aditya Bhargava <heuristicist@gmail.com>
Ajay Berwal <ajay.berwal@samsung.com>
Ajith Kumar V <ajith.v@samsung.com>
Aku Kotkavuo <a.kotkavuo@partner.samsung.com>
Alex Gartrell <agartrell@cmu.edu>
Alex Henrie <alexhenrie24@gmail.com>
Alex Scheele <alexscheele@gmail.com>
......
......@@ -252,7 +252,7 @@ def KillAllAdb():
try:
if 'adb' in p.name:
yield p
except (psutil.error.NoSuchProcess, psutil.error.AccessDenied):
except (psutil.NoSuchProcess, psutil.AccessDenied):
pass
for sig in [signal.SIGTERM, signal.SIGQUIT, signal.SIGKILL]:
......@@ -261,12 +261,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, psutil.error.AccessDenied):
except (psutil.NoSuchProcess, psutil.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, psutil.error.AccessDenied):
except (psutil.NoSuchProcess, psutil.AccessDenied):
pass
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment