This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch brokerclient in repository python-x2go. commit a08fa96bba7d3218fc952c0f4692fcad9f8cf9c6 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Jan 8 15:14:30 2014 +0100 release 0.4.0.9 Conflicts (resolved by Mike Gabriel): debian/changelog --- debian/changelog | 4 ++-- x2go/backends/control/plain.py | 24 ++++++++++++------------ 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/debian/changelog b/debian/changelog index bc14f99..1204581 100644 --- a/debian/changelog +++ b/debian/changelog @@ -21,7 +21,7 @@ python-x2go (0.4.0.10-0x2go1) UNRELEASED; urgency=low -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Sun, 05 Jan 2014 16:35:57 +0100 -python-x2go (0.4.0.9-0x2go1) UNRELEASED; urgency=low +python-x2go (0.4.0.9-0x2go1) unstable; urgency=low [ Mike Gabriel ] * New upstream version (0.4.0.9): @@ -84,7 +84,7 @@ python-x2go (0.4.0.9-0x2go1) UNRELEASED; urgency=low returns the width of a vertical scroll bar in pixels. Instead, create a screen display context and query it for the color depth. (Fixes: #330). - -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Wed, 07 Aug 2013 12:18:46 +0200 + -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Wed, 08 Jan 2014 15:14:16 +0100 python-x2go (0.4.0.8-0~x2go1) unstable; urgency=low diff --git a/x2go/backends/control/plain.py b/x2go/backends/control/plain.py index d2784f6..75fc053 100644 --- a/x2go/backends/control/plain.py +++ b/x2go/backends/control/plain.py @@ -1014,19 +1014,19 @@ class X2GoControlSession(paramiko.SSHClient): if not password: password = "".join([random.choice(string.letters+string.digits) for x in range(1, 20)]) self.logger('performing SSH password authentication with server', loglevel=log.loglevel_DEBUG) - try: - paramiko.SSHClient.connect(self, _hostname, port=port, username=username, password=password, + #try: + paramiko.SSHClient.connect(self, _hostname, port=port, username=username, password=password, timeout=timeout, allow_agent=False, look_for_keys=False) - except paramiko.AuthenticationException, e: - self.close() - if self.sshproxy_session: - self.sshproxy_session.stop_thread() - raise e - except: - self.close() - if self.sshproxy_session: - self.sshproxy_session.stop_thread() - raise + #except paramiko.AuthenticationException, e: + # self.close() + # if self.sshproxy_session: + # self.sshproxy_session.stop_thread() + # raise e + #except: + # self.close() + # if self.sshproxy_session: + # self.sshproxy_session.stop_thread() + # raise self.set_missing_host_key_policy(paramiko.RejectPolicy()) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/python-x2go.git