[X2Go-Commits] python-x2go.git - twofactorauth (branch) updated: 0.1.0.3-23-g9dbd64e

[X2Go dev team]

The branch, twofactorauth has been updated
       via  9dbd64ed33bd983ac81693493fa56eb5b7827f1e (commit)
      from  d5f0709a91e364d88ae76d95235d6f02860f3d68 (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 |   22 ++++++++--------------
 2 files changed, 10 insertions(+), 15 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 2ff1b74..801b4fc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,9 @@ python-x2go (0.1.1.0-0~x2go1) UNRELEASED; urgency=low
     - Close SSH connection first, then close down SSH proxy.
     - 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.
 
- -- Mike Gabriel <mike at mimino.das-netzwerkteam.de>  Mon, 20 Jun 2011 14:16:54 +0200
+ -- Mike Gabriel <mike at mimino.das-netzwerkteam.de>  Tue, 21 Jun 2011 14:20:48 +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 c3e5725..8c7a617 100644
--- a/x2go/backends/control/_stdout.py
+++ b/x2go/backends/control/_stdout.py
@@ -187,8 +187,6 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient):
             try:
                 self.logger('executing command on X2go server: %s' % _rerewrite_blanks(cmd), loglevel)
                 _retval = self.exec_command(_rewrite_password(cmd, user=self.get_transport().get_username(), password=self._session_password), **kwargs)
-                self.locked = False
-                timeout.cancel()
             except AttributeError:
                 self.session_died = True
                 if self.sshproxy_session:
@@ -656,15 +654,8 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient):
 
                 _stdout_read = stdout.read()
 
-                try:
-                    _listdesktops = _stdout_read.split('\n')
-                    _success = True
-                except KeyError:
-                    gevent.sleep(1)
-                except IndexError:
-                    gevent.sleep(1)
-                except ValueError:
-                    gevent.sleep(1)
+                _listdesktops = _stdout_read.split('\n')
+                _success = True
 
             return _listdesktops
 
@@ -683,17 +674,20 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient):
 
         """
         if raw:
-            (stdin, stdout, stderr) = self._x2go_exec_command("x2golistsessions")
+            (stdin, stdout, stderr) = self._x2go_exec_command("export HOSTNAME && x2golistsessions")
             return stdout.read(), stderr.read()
 
         else:
 
             # 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
+            _listsessions = {}
             _success = False
-            while not _success:
+            _count = 0
+            while not _success or _count < 50:
 
-                (stdin, stdout, stderr) = self._x2go_exec_command("x2golistsessions")
+                _count += 2
+                (stdin, stdout, stderr) = self._x2go_exec_command("export HOSTNAME && x2golistsessions")
 
                 _stdout_read = stdout.read()
 


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