This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository python-x2go. commit 4f03a834812aec5334546469ec6b1a2429e2ca38 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Dec 27 14:08:30 2019 +0000 Check availability of X2Go KDrive base support server-side before firing up x2gokdriveclient. --- debian/changelog | 2 ++ x2go/backends/terminal/plain.py | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 006c3de..828f991 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,8 @@ python-x2go (0.6.1.3-0x2go1) UNRELEASED; urgency=medium - x2go/backends/terminal/plain.py: Fix keyboard layout setting under Python3. <bytes>.decode() does not modify the variable in place but needs an assignment. + - Check availability of X2Go KDrive base support server-side before + firing up x2gokdriveclient. -- X2Go Release Manager <git-admin@x2go.org> Thu, 26 Dec 2019 10:37:02 +0100 diff --git a/x2go/backends/terminal/plain.py b/x2go/backends/terminal/plain.py index 6a9bd8e..fc4ece6 100644 --- a/x2go/backends/terminal/plain.py +++ b/x2go/backends/terminal/plain.py @@ -1598,6 +1598,10 @@ class X2GoTerminalSession(object): else: self.proxy_backend = utils._get_backend_class("default", "X2GoProxy") + if self.params.kdrive and not 'X2GOKDRIVE_BASE_SUPPORT' in self.control_session.get_server_features(): + self.logger('X2Go KDrive is not supported on the remote X2Go Server', loglevel=log.loglevel_ERROR) + raise x2go_exceptions.X2GoTerminalSessionException('X2Go KDrive is not support server-side') + self.params.rewrite_session_type() if self.params.geometry == 'maximize': -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/python-x2go.git