Don't crash if the ssh client is already dead

If the SSH client terminated abnormally in the background (e.g. the
server shutdown while we were doing a sync) then the pid won't exist.
Instead of crashing, ignore it, the result we wanted (a non-orphaned
ssh process) is already acheived.

Signed-off-by: Shawn O. Pearce <sop@google.com>
This commit is contained in:
Shawn O. Pearce 2009-06-16 11:49:10 -07:00
parent 7da73d6f3b
commit 26120ca18d

View File

@ -385,8 +385,11 @@ def _open_ssh(host, port):
def close_ssh():
for key,p in _ssh_cache.iteritems():
os.kill(p.pid, SIGTERM)
p.wait()
try:
os.kill(p.pid, SIGTERM)
p.wait()
catch OSError:
pass
_ssh_cache.clear()
d = _ssh_sock(create=False)