[X2Go-Commits] python-x2go.git - build-main (branch) updated: 0.4.0.8-44-geb2f3b2
X2Go dev team
git-admin at x2go.org
Wed Jan 8 15:15:20 CET 2014
The branch, build-main has been updated
via eb2f3b21a3f4ac7d56ffa3ed513164781f99d4a5 (commit)
from 5e464584486b60d954f6e777f4f0415a7f3f3e53 (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 -----------------------------------------------------------------
commit eb2f3b21a3f4ac7d56ffa3ed513164781f99d4a5
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Wed Jan 8 15:14:30 2014 +0100
release 0.4.0.9
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 4 ++--
x2go/backends/control/_stdout.py | 24 ++++++++++++------------
2 files changed, 14 insertions(+), 14 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index eb0426d..11ca201 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-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):
@@ -61,7 +61,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 at das-netzwerkteam.de> Wed, 07 Aug 2013 12:18:46 +0200
+ -- Mike Gabriel <mike.gabriel at 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/_stdout.py b/x2go/backends/control/_stdout.py
index afb6bc1..2ebbceb 100644
--- a/x2go/backends/control/_stdout.py
+++ b/x2go/backends/control/_stdout.py
@@ -1018,19 +1018,19 @@ class X2GoControlSessionSTDOUT(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())
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