[X2Go-Commits] python-x2go.git - brokerclient (branch) updated: 0.0.39.0-97-gba5268c

X2Go dev team git-admin at x2go.org
Tue Jan 7 16:20:19 CET 2014


The branch, brokerclient has been updated
       via  ba5268c21cfc7f8959c6b787a1bda6295f786116 (commit)
      from  b942b22a7c23a250245d2204f0e9f59ed3907d91 (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:
 x2go/session.py |   39 +++++++++++++++++++++++----------------
 1 file changed, 23 insertions(+), 16 deletions(-)

The diff of changes is:
diff --git a/x2go/session.py b/x2go/session.py
index 3236c71..5f1dde7 100644
--- a/x2go/session.py
+++ b/x2go/session.py
@@ -553,11 +553,12 @@ class X2goSession(object):
         self.running = None
         self.suspended = None
         self.terminated = None
+        retval = self.control_session.disconnect()
         try:
             self.update_status()
         except X2goControlSessionException:
             pass
-        return self.control_session.disconnect()
+        return retval
     __disconnect = disconnect
 
     def set_print_action(self, print_action, **kwargs):
@@ -609,6 +610,7 @@ class X2goSession(object):
         STILL UNDOCUMENTED
 
         """
+        e = None
         self._last_status = copy.deepcopy(self._current_status)
         if session_list is None:
             try:
@@ -619,21 +621,22 @@ class X2goSession(object):
                 self.running = None
                 self.suspended = None
                 self.terminated = None
-                raise e
-        try:
-            _session_name = self.get_session_name()
-            _session_info = session_list[_session_name]
-            self.running = _session_info.is_running()
-            self.suspended = _session_info.is_suspended()
-            if not self.virgin:
-                self.terminated = not (_session_info.is_running() or _session_info.is_suspended())
-            else:
-                self.terminated = None
-        except KeyError:
-            self.running = False
-            self.suspended = False
-            if not self.virgin:
-                self.terminated = True
+
+        if self.connected:
+            try:
+                _session_name = self.get_session_name()
+                _session_info = session_list[_session_name]
+                self.running = _session_info.is_running()
+                self.suspended = _session_info.is_suspended()
+                if not self.virgin:
+                    self.terminated = not (_session_info.is_running() or _session_info.is_suspended())
+                else:
+                    self.terminated = None
+            except KeyError:
+                self.running = False
+                self.suspended = False
+                if not self.virgin:
+                    self.terminated = True
 
         self._current_status = {
             'server': self.server,
@@ -643,6 +646,10 @@ class X2goSession(object):
             'suspended': self.suspended,
             'terminated': self.terminated,
         }
+
+        if not self.connected and e:
+            raise e
+
     __update_status = update_status
 
     def resume(self, session_name=None):


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