r12197 - /branches/bieri_gui/auto_analyses/dauvergne_protocol.py -- January 11, 2011 - 11:51

Author: bugman
Date: Tue Jan 11 11:51:06 2011
New Revision: 12197

URL: http://svn.gna.org/viewcvs/relax?rev=12197&view=rev
Log:
The svnmerge conflict resolution procedure at r12188 for the 
dauvergne_protocol module was broken.

The auto-protocol was acquiring the execution lock twice, hence was blocking 
itself!



Modified:
    branches/bieri_gui/auto_analyses/dauvergne_protocol.py

Modified: branches/bieri_gui/auto_analyses/dauvergne_protocol.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/bieri_gui/auto_analyses/dauvergne_protocol.py?rev=12197&r1=12196&r2=12197&view=diff
==============================================================================
--- branches/bieri_gui/auto_analyses/dauvergne_protocol.py (original)
+++ branches/bieri_gui/auto_analyses/dauvergne_protocol.py Tue Jan 11 
11:51:06 2011
@@ -223,9 +223,6 @@
             for name in user_fns:
                 setattr(self.interpreter, name, user_fns[name])
 
-        # Execution lock.
-        status.exec_lock.acquire('auto dauvergne protocol')
-
         # Execute the protocol.
         try:
             self.execute()