[X2Go-Commits] python-x2go.git - brokerclient (branch) updated: 01598c83cc699803bc7b1b3e18d137fd9420b81d

[X2Go dev team]

The branch, brokerclient has been updated
       via  01598c83cc699803bc7b1b3e18d137fd9420b81d (commit)
      from  caed97e5999e9ecd336be59d7246261e743ef2a4 (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/backends/control/stdout.py |    6 +++---
 x2go/client.py                  |    7 ++++++-
 2 files changed, 9 insertions(+), 4 deletions(-)

The diff of changes is:
diff --git a/x2go/backends/control/stdout.py b/x2go/backends/control/stdout.py
index 9bda4de..1d0a2f6 100644
--- a/x2go/backends/control/stdout.py
+++ b/x2go/backends/control/stdout.py
@@ -51,10 +51,10 @@ def _rerewrite_blanks(cmd):
 
 def _rewrite_password(cmd, password):
 
-    # if there is a ,,-p :X2GOPASSWORD:'' parameter in RDP options then we will replace 
+    # if there is a ,,-p X2GO_PASSWORD'' parameter in RDP options then we will replace 
     # it by our X2go session password
-    if cmd:
-        cmd = cmd.replace(':X2GOPASSWORD:', password)
+    if cmd and password:
+        cmd = cmd.replace('X2GO_PASSWORD', password)
     return cmd
 
 
diff --git a/x2go/client.py b/x2go/client.py
index bffccac..a63d669 100644
--- a/x2go/client.py
+++ b/x2go/client.py
@@ -1155,7 +1155,12 @@ class X2goClient(object):
 
         """
         if self.listsessions_cache is not None:
-            self.listsessions_cache.update(profile_name, seconds=seconds)
+            try:
+                self.listsessions_cache.update(profile_name, seconds=seconds)
+            except x2go_exceptions.X2goControlSessionException:
+                self.HOOK_on_control_session_death(profile_name)
+                self.disconnect_profile(profile_name)
+                return False
     __update_cache_by_profile = update_cache_by_profile
 
     def update_cache_by_session_uuid(self, session_uuid, seconds=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).