[X2Go-Commits] python-x2go.git - build-baikal (branch) updated: 0.2.0.6-3-g4d9aad3
X2Go dev team
git-admin at x2go.org
Wed Jan 8 15:31:11 CET 2014
The branch, build-baikal has been updated
via 4d9aad32b35c89acda9c1a6980d4de6d24eb5f02 (commit)
from 1a965b5147e4bb59fe764c4130f2157195a3dae7 (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 | 16 +++++++++++-----
2 files changed, 13 insertions(+), 6 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index eca3555..1392858 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
python-x2go (0.2.0.7-0~x2go1) UNRELEASED; urgency=low
- * Continue development...
+ * New upstream version (0.2.0.7):
+ - Refresh server feature list on re-connecting (log-off, log-on).
-- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Mon, 02 Jul 2012 20:57:37 +0200
diff --git a/x2go/backends/control/_stdout.py b/x2go/backends/control/_stdout.py
index 05f355c..2b22b0c 100644
--- a/x2go/backends/control/_stdout.py
+++ b/x2go/backends/control/_stdout.py
@@ -438,14 +438,19 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient):
else:
return self._server_features
- def query_server_features(self):
+ def query_server_features(self, force=False):
"""\
Do a query for the server-side list of X2Go features.
+ @param force: do not use the cached feature list, really ask the server (again)
+ @type force: C{bool}
+
@return: list of X2Go feature names
@rtype: C{list}
"""
+ if force:
+ self._server_features = None
return self._x2go_server_features
get_server_features = query_server_features
@@ -814,12 +819,13 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient):
ssh_transport._x2go_session_marker = True
self._session_password = password
- if self.get_transport():
- self.session_died = False
-
if not self.home_exists():
raise x2go_exceptions.X2goRemoteHomeException('remote home directory does not exist')
+ if self.get_transport():
+ self.session_died = False
+ self.query_server_features(force=True)
+
return (self.get_transport() is not None)
def dissociate(self, terminal_session):
@@ -959,7 +965,7 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient):
elif lang is None:
lang = 'en'
- if 'X2GO_PUBLISHED_APPLICATIONS' in self._x2go_server_features:
+ if 'X2GO_PUBLISHED_APPLICATIONS' in self.get_server_features():
if self._published_applications_menu is {} or \
not self._published_applications_menu.has_key(lang) or \
raw or very_raw or refresh or \
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