[X2Go-Commits] python-x2go.git - build-baikal (branch) updated: 0.1.0.3-25-gb43c50f

X2Go dev team git-admin at x2go.org
Wed Jan 8 15:28:34 CET 2014


The branch, build-baikal has been updated
       via  b43c50f7a6d7a9810f7ef5b7d7e5e53bc10f550d (commit)
      from  5a148fdf12b44d6b8f0398f8cb9dcabaeb39064d (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                 |    3 ++-
 x2go/backends/control/_stdout.py |   29 +++++++----------------------
 2 files changed, 9 insertions(+), 23 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 801b4fc..46ecd2b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,8 +7,9 @@ python-x2go (0.1.1.0-0~x2go1) UNRELEASED; urgency=low
     - Make sure SSH proxy password gets forgotten between two sessions.
     - Add X2goSession status property ,,faulty''.
     - Make sure list session and list desktop commands always return.
+    - Rely on X2goSessionListInfo backend to handle exceptions appropriately.
 
- -- Mike Gabriel <mike at mimino.das-netzwerkteam.de>  Tue, 21 Jun 2011 14:20:48 +0200
+ -- Mike Gabriel <mike at mimino.das-netzwerkteam.de>  Tue, 21 Jun 2011 15:07:56 +0200
 
 python-x2go (0.1.0.3-0~x2go1) unstable; urgency=low
 
diff --git a/x2go/backends/control/_stdout.py b/x2go/backends/control/_stdout.py
index fd0774b..d6ebe72 100644
--- a/x2go/backends/control/_stdout.py
+++ b/x2go/backends/control/_stdout.py
@@ -185,7 +185,7 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient):
             timeout = gevent.Timeout(20)
             timeout.start()
             try:
-                self.logger('executing command on X2go server: %s' % _rerewrite_blanks(cmd), loglevel)
+                self.logger("executing command on X2go server ,,%s'': %s" % (self.profile_name, _rerewrite_blanks(cmd)), loglevel)
                 _retval = self.exec_command(_rewrite_password(cmd, user=self.get_transport().get_username(), password=self._session_password), **kwargs)
             except AttributeError:
                 self.session_died = True
@@ -647,15 +647,11 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient):
 
             # this _success loop will catch errors in case the x2golistsessions output is corrupt
             # this should not be needed and is a workaround for the current X2go server implementation
-            _success = False
-            while not _success:
-
-                (stdin, stdout, stderr) = self._x2go_exec_command("export HOSTNAME && x2golistdesktops")
 
-                _stdout_read = stdout.read()
+            (stdin, stdout, stderr) = self._x2go_exec_command("export HOSTNAME && x2golistdesktops")
+            _stdout_read = stdout.read()
 
-                _listdesktops = _stdout_read.split('\n')
-                _success = True
+            _listdesktops = _stdout_read.split('\n')
 
             return _listdesktops
 
@@ -684,22 +680,11 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient):
             _listsessions = {}
             _success = False
             _count = 0
-            while not _success and not (_count >= 50):
-
-                _count += 2
-                (stdin, stdout, stderr) = self._x2go_exec_command("export HOSTNAME && x2golistsessions")
 
-                _stdout_read = stdout.read()
+            (stdin, stdout, stderr) = self._x2go_exec_command("export HOSTNAME && x2golistsessions")
+            _stdout_read = stdout.read()
 
-                try:
-                    _listsessions = self._list_backend(_stdout_read, info_backend=self._info_backend).sessions
-                    _success = True
-                except KeyError:
-                    gevent.sleep(.2)
-                except IndexError:
-                    gevent.sleep(.2)
-                except ValueError:
-                    gevent.sleep(.2)
+            _listsessions = self._list_backend(_stdout_read, info_backend=self._info_backend).sessions
 
             # update internal variables when list_sessions() is called
             for _session_name, _session_info in self.associated_terminals.items():


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