r11842 - /1.3/prompt/interpreter.py -- December 16, 2010 - 12:37

Author: bugman
Date: Thu Dec 16 12:37:36 2010
New Revision: 11842

URL: http://svn.gna.org/viewcvs/relax?rev=11842&view=rev
Log:
The execution lock mechanism no longer blocks scripts from running within 
scripts.


Modified:
    1.3/prompt/interpreter.py

Modified: 1.3/prompt/interpreter.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/prompt/interpreter.py?rev=11842&r1=11841&r2=11842&view=diff
==============================================================================
--- 1.3/prompt/interpreter.py (original)
+++ 1.3/prompt/interpreter.py Thu Dec 16 12:37:36 2010
@@ -326,6 +326,11 @@
         orig_intro_state = self._exec_info.intro
         self._exec_info.intro = True
 
+        # Unlock if necessary.
+        status = Status()
+        if status.exec_lock.locked():
+            status.exec_lock.release()
+
         # Execute the script.
         run_script(local=self._locals, script_file=file, quit=quit)
 
@@ -365,7 +370,8 @@
     runpy.run_module(module, globals)
 
     # Unlock execution.
-    status.exec_lock.release()
+    if status.exec_lock.locked():
+        status.exec_lock.release()
 
 
 def interact_prompt(self, intro=None, local={}):