r19582 - in /branches/relax_disp: ./ prompt/interpreter.py -- April 22, 2013 - 14:06

Author: bugman
Date: Mon Apr 22 14:06:54 2013
New Revision: 19582

URL: http://svn.gna.org/viewcvs/relax?rev=19582&view=rev
Log:
Merged revisions 19581 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk

........
  r19581 | bugman | 2013-04-22 14:06:36 +0200 (Mon, 22 Apr 2013) | 8 lines
  
  Fix for the nasty bug #20756 (https://gna.org/bugs/?20756).
  
  The problem was that the global execution lock was not always released by a 
relax script when
  certain errors are raised during the script execution.  This does not occur 
for all types of error
  though.  Now the release of the lock has been shifted into the 'finally' 
statement to absolutely
  force lock release.
........

Modified:
    branches/relax_disp/   (props changed)
    branches/relax_disp/prompt/interpreter.py

Propchange: branches/relax_disp/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Apr 22 14:06:54 2013
@@ -1,1 +1,1 @@
-/trunk:1-19577
+/trunk:1-19581

Modified: branches/relax_disp/prompt/interpreter.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/prompt/interpreter.py?rev=19582&r1=19581&r2=19582&view=diff
==============================================================================
--- branches/relax_disp/prompt/interpreter.py (original)
+++ branches/relax_disp/prompt/interpreter.py Mon Apr 22 14:06:54 2013
@@ -353,8 +353,8 @@
         sys.path.reverse()
         sys.path.pop(sys.path.index(script_path))
 
-    # Unlock execution if needed.
-    status.exec_lock.release()
+        # Unlock execution if needed.
+        status.exec_lock.release()
 
 
 def interact_prompt(self, intro=None, local={}):