--- a/server/utils.py Tue May 25 11:51:48 2010 +0200 +++ b/server/utils.py Wed May 26 12:33:48 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):