Rev 1331: Add hack to make sure other thread doesn't hang, as suggested by Martin. in http://people.samba.org/bzr/jelmer/bzr-svn/0.4

Jelmer Vernooij jelmer at samba.org
Tue Jun 24 02:10:29 BST 2008


At http://people.samba.org/bzr/jelmer/bzr-svn/0.4

------------------------------------------------------------
revno: 1331
revision-id: jelmer at samba.org-20080624011028-239pvr1q81x0r1l2
parent: jelmer at samba.org-20080624010956-iiejnm9uk1peilf7
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Tue 2008-06-24 03:10:28 +0200
message:
  Add hack to make sure other thread doesn't hang, as suggested by Martin.
modified:
  transport.py                   transport.py-20060406231150-b3472d06b3a0818d
=== modified file 'transport.py'
--- a/transport.py	2008-06-24 00:25:39 +0000
+++ b/transport.py	2008-06-24 01:10:28 +0000
@@ -260,11 +260,14 @@
                     self.pending.append(args)
                     self.semaphore.release()
                 try:
-                    self.conn.get_log(callback=rcvr, *self.args, **self.kwargs)
-                    self.pending.append(None)
-                except Exception, e:
-                    self.pending.append(e)
-                self.semaphore.release()
+                    try:
+                        self.conn.get_log(callback=rcvr, *self.args, **self.kwargs)
+                        self.pending.append(None)
+                    except Exception, e:
+                        self.pending.append(e)
+                finally:
+                    self.pending.append(RuntimeException("Some exception was not handled"))
+                    self.semaphore.release()
 
         if paths is None:
             newpaths = None
@@ -428,6 +431,7 @@
         return self.PhonyLock() # FIXME
 
     def _is_http_transport(self):
+        return False
         return (self.svn_url.startswith("http://") or 
                 self.svn_url.startswith("https://"))
 




More information about the bazaar-commits mailing list