[X2go-Commits] python-x2go.git - master (branch) updated: 0.2.0.10-73-gda000f3

X2Go dev team git-admin at x2go.org
Sat Nov 17 00:05:34 CET 2012


The branch, master has been updated
       via  da000f3c040a8217ebdfc10e6d25065a1b887810 (commit)
      from  bda44ea56d0e45b4b5ced3b25aed52aa70baa5ff (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit da000f3c040a8217ebdfc10e6d25065a1b887810
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat Nov 17 00:04:07 2012 +0100

    prevent blocking ourselves

-----------------------------------------------------------------------

Summary of changes:
 x2go/session.py |    9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

The diff of changes is:
diff --git a/x2go/session.py b/x2go/session.py
index d6ae740..678b222 100644
--- a/x2go/session.py
+++ b/x2go/session.py
@@ -884,8 +884,6 @@ class X2goSession(object):
         @rtype: C{str}
 
         """
-        self._lock.acquire()
-        self._lock.release()
         return self.session_name
     __get_session_name = get_session_name
 
@@ -1740,7 +1738,9 @@ class X2goSession(object):
             if self.is_running():
                 try:
 
+                    self._lock.release()
                     self.suspend()
+                    self._lock.acquire()
 
                     self._progress_status = 10
                     progress_event.set()
@@ -1764,7 +1764,7 @@ class X2goSession(object):
 
                 self._progress_status = -1
                 progress_event.set()
-
+                self._lock.release()
                 raise
 
             if cmd is not None:
@@ -2179,11 +2179,8 @@ class X2goSession(object):
         @rtype: C{bool}
 
         """
-        self._lock.acquire()
         if self.has_terminal_session():
-            self._lock.release()
             return self.terminal_session.ok()
-        self._lock.release()
         return False
     __session_ok = session_ok
 


hooks/post-receive
-- 
python-x2go.git (Python X2Go Client API)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "python-x2go.git" (Python X2Go Client API).




More information about the x2go-commits mailing list