[X2Go-Commits] python-x2go.git - brokerclient (branch) updated: 0.1.0.3-37-gf046c26

[X2Go dev team]

The branch, brokerclient has been updated
       via  f046c26dbdb42ac59cdf994ba6e53791391704d7 (commit)
      from  b60599dc6cb45440fdced438873022d43942434f (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 debian/changelog |    1 +
 x2go/session.py  |   15 +++++++++++++++
 2 files changed, 16 insertions(+)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index a9c6f33..52c3ccc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,7 @@ python-x2go (0.1.1.0-0~x2go1) UNRELEASED; urgency=low
     - Make fw tunneling more robust against failures.
     - Test focus put on client inter-operation. It is reliably possible now to move
       sessions between different clients without resume failures.
+    - Add X2goSession lock support.
 
  -- Mike Gabriel <mike at mimino.das-netzwerkteam.de>  Wed, 22 Jun 2011 01:20:48 +0200
 
diff --git a/x2go/session.py b/x2go/session.py
index cdfa76f..cb101b1 100644
--- a/x2go/session.py
+++ b/x2go/session.py
@@ -212,6 +212,8 @@ class X2goSession(object):
 
         self._last_status = None
 
+        self.locked = False
+
         self.printing = printing
         self.allow_share_local_folders = allow_share_local_folders
         self.share_local_folders = share_local_folders
@@ -1293,6 +1295,19 @@ class X2goSession(object):
             raise X2goSessionException('this X2goSession object does not have any associated terminal')
     __share_local_folder = share_local_folder
 
+    def is_locked(self):
+        """\
+        Query session if it is locked by some command being processed.
+
+        @return: return C{True} is the session is locked, C{False} if not; returns None, if there is no
+            control session yet.
+        @rtype: C{bool}
+
+        """
+        if self.control_session is not None:
+            return self.control_session.locked or self.locked
+        return None
+
     def session_cleanup(self):
         """\
         Clean up X2go session.


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).