This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository python-x2go. from 19feecc End session gracefully if we fail setting up the SSH agent forwarding socket. new be80cd9 improve last commit The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: x2go/backends/control/plain.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) -- Alioth's /srv/git/code.x2go.org/python-x2go.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/python-x2go.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository python-x2go. commit be80cd9f0dd76cdd5453aff21c2ce5469075ab3f Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Mar 9 13:02:50 2015 +0100 improve last commit --- x2go/backends/control/plain.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/x2go/backends/control/plain.py b/x2go/backends/control/plain.py index 415973f..0cf2d2a 100644 --- a/x2go/backends/control/plain.py +++ b/x2go/backends/control/plain.py @@ -1131,18 +1131,18 @@ class X2GoControlSession(paramiko.SSHClient): self.session_died = False self.query_server_features(force=True) - try: - if self.forward_sshagent: - if x2go._paramiko.PARAMIKO_FEATURE['forward-ssh-agent']: + if self.forward_sshagent: + if x2go._paramiko.PARAMIKO_FEATURE['forward-ssh-agent']: + try: self.agent_chan = ssh_transport.open_session() self.agent_handler = paramiko.agent.AgentRequestHandler(self.agent_chan) self.logger('Requesting SSH agent forwarding for control session of connected session profile %s' % self.profile_name, loglevel=log.loglevel_INFO) - else: - self.logger('SSH agent forwarding is not available in the Paramiko version used with this instance of Python X2Go', loglevel=log.loglevel_WARN) - except EOFError, e: - # if we come across an EOFError here, we must assume the session is dead... - self.session_died = True - raise x2go_exceptions.X2GoControlSessionException('The SSH connection was dropped while setting up SSH agent forwarding socket.') + except EOFError, e: + # if we come across an EOFError here, we must assume the session is dead... + self.session_died = True + raise x2go_exceptions.X2GoControlSessionException('The SSH connection was dropped while setting up SSH agent forwarding socket.') + else: + self.logger('SSH agent forwarding is not available in the Paramiko version used with this instance of Python X2Go', loglevel=log.loglevel_WARN) else: self.close() -- Alioth's /srv/git/code.x2go.org/python-x2go.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/python-x2go.git
-
git-admin＠x2go.org