android/git-repo
1
Fork 0
mirror of https://gerrit.googlesource.com/git-repo synced 2024-12-21 07:16:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't crash if the ssh client is already dead

Browse Source 
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
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
git_config.py
View File

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