r11864 - /1.3/status.py -- December 17, 2010 - 14:51

Author: bugman
Date: Fri Dec 17 14:51:20 2010
New Revision: 11864

URL: http://svn.gna.org/viewcvs/relax?rev=11864&view=rev
Log:
Fix for the execution locking when an auto-analysis is launched from a script.

The lock is not released and a new one acquired.  Instead the mechanism is 
script, just as it is
for nested scripting.


Modified:
    1.3/status.py

Modified: 1.3/status.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/status.py?rev=11864&r1=11863&r2=11864&view=diff
==============================================================================
--- 1.3/status.py (original)
+++ 1.3/status.py Fri Dec 17 14:51:20 2010
@@ -118,18 +118,18 @@
             # Return without doing anything.
             return
 
-        # Unlock and re-lock if an auto-analysis is called from a script.
+        # Skip locking if an auto-analysis is called from a script.
         if self.locked() and self._name == 'script UI' and search('^auto', 
name):
             # Debugging.
             if __main__.debug:
-                self.log.write("Forced release of script UI lock by %s\n" % 
name)
-                self.log.flush()
-
-            # Release the lock.
-            self._lock.release()
+                self.log.write("Skipped unlocking of '%s' lock by '%s'\n" % 
(self._name, name))
+                self.log.flush()
 
             # Switch the flag.
             self._auto_from_script = True
+
+            # Return without doing anything.
+            return
 
         # Store the new name.
         self._name = name
@@ -174,11 +174,11 @@
             # Return without releasing the lock.
             return
 
-        # Prior forced release, so let the script release.
+        # Auto-analysis launched from script.
         if self._auto_from_script:
             # Debugging.
             if __main__.debug:
-                self.log.write("Prior forced release, skipping release.")
+                self.log.write("Auto-analysis launched from script, skipping 
release.\n")
                 self.log.flush()
 
             # Unset the flag.