conduit r1393 - in trunk: . conduit

[jstowers svn gnome org]

Author: jstowers
Date: Wed Mar 26 09:22:33 2008
New Revision: 1393
URL: http://svn.gnome.org/viewvc/conduit?rev=1393&view=rev

Log:
2008-03-26  John Stowers  <john stowers gmail com>

	* conduit/Vfs.py: Joining unstarted threads either throws an AssertionError
	or a RuntimeError, depending on the phase of the moon. Catch both.

2008-03-26  John Stowers  <john stowers gmail com>


Modified:
   trunk/ChangeLog
   trunk/conduit/Vfs.py

Modified: trunk/conduit/Vfs.py
==============================================================================
--- trunk/conduit/Vfs.py	(original)
+++ trunk/conduit/Vfs.py	Wed Mar 26 09:22:33 2008
@@ -304,7 +304,7 @@
                 try:
                     thread.join()
                     joinedThreads += 1
-                except RuntimeError: 
+                except (RuntimeError, AssertionError):
                     #deal with not started threads
                     time.sleep(0.1)