This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository python-x2go. commit 920d12ee87613cddddf164e656ad69e76a753989 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Oct 7 14:01:40 2014 +0200 Fix transport lock release in X2GoControlSession._x2go_sftp_put(). --- debian/changelog | 1 + x2go/backends/control/plain.py | 2 +- x2go/backends/profiles/base.py | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 56f0739..c44f64e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -102,6 +102,7 @@ python-x2go (0.5.0.0-0x2go1) UNRELEASED; urgency=low gracefully. - Don't choke on non-initialized SSH transport objects when initializing SFTP client. + - Fix transport lock release in X2GoControlSession._x2go_sftp_put(). * debian/control: + Add dependencies: python-requests, python-simplejson. * python-x2go.spec: diff --git a/x2go/backends/control/plain.py b/x2go/backends/control/plain.py index ac2dcb3..b77d138 100644 --- a/x2go/backends/control/plain.py +++ b/x2go/backends/control/plain.py @@ -373,7 +373,7 @@ class X2GoControlSession(paramiko.SSHClient): self.logger('sFTP-write: removing remote file %s on host %s failed' % (remote_path, self.remote_peername()), loglevel=log.loglevel_WARN) raise x2go_exceptions.X2GoControlSessionException('The SSH connection was dropped during an sFTP remove action.') self.sftp_client = None - self._transport_lock.release() + self._transport_lock.release() def _x2go_exec_command(self, cmd_line, loglevel=log.loglevel_INFO, timeout=20, **kwargs): """ diff --git a/x2go/backends/profiles/base.py b/x2go/backends/profiles/base.py index 2855d09..7310518 100644 --- a/x2go/backends/profiles/base.py +++ b/x2go/backends/profiles/base.py @@ -576,6 +576,8 @@ class X2GoSessionProfiles(): raise X2GoProfileException('profile name for profile id %s must not be empty' % profile_id) else: if profile_name != current_profile_name: + try: del self._cached_profile_ids[profile_id] + except KeyError: pass if profile_name in self.profile_names: raise X2GoProfileException('a profile of name ,,%s\'\' already exists' % profile_name) self._cached_profile_ids[profile_id] = profile_name -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/python-x2go.git