# HG changeset patch # User Sylvain Thénault # Date 1274782877 -7200 # Node ID 0aae5216f99e65db97269fa87cb01f8bf122bbad # Parent 3e9e6dd54ebbb1632440e09224d02e677f3c36a0 [repo] ensure thread is alive before calling .join. Closes #963580 diff -r 3e9e6dd54ebb -r 0aae5216f99e server/utils.py --- a/server/utils.py Tue May 25 12:20:26 2010 +0200 +++ b/server/utils.py Tue May 25 12:21:17 2010 +0200 @@ -143,7 +143,8 @@ self._t.cancel() def join(self): - self._t.join() + if self._t.isAlive(): + self._t.join() class RepoThread(Thread):