[X2Go-Commits] python-x2go.git - build-baikal (branch) updated: 0.2.1.1-31-geb0cf27

X2Go dev team git-admin at x2go.org
Wed Jan 8 15:29:38 CET 2014


The branch, build-baikal has been updated
       via  eb0cf279859b9ac49f72cda07b8ca7730dfe7a7e (commit)
      from  5415362f73739312014478cb6b382369dbd3d5c7 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 x2go/backends/control/_stdout.py |    3 ++-
 x2go/inifiles.py                 |    4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

The diff of changes is:
diff --git a/x2go/backends/control/_stdout.py b/x2go/backends/control/_stdout.py
index a8e8fca..b8c4c10 100644
--- a/x2go/backends/control/_stdout.py
+++ b/x2go/backends/control/_stdout.py
@@ -732,7 +732,8 @@ class X2GoControlSessionSTDOUT(paramiko.SSHClient):
             self.unique_hostkey_aliases = unique_hostkey_aliases
             # prep the fake hostname with the real hostname, so we trigger the corresponding code path in 
             # x2go.checkhosts and either of its missing host key policies
-            _fake_hostname = "[%s]:%s" % (hostname, port)
+            if self.unique_hostkey_aliases:
+                _fake_hostname = "[%s]:%s" % (hostname, port)
 
         if use_sshproxy and sshproxy_host and sshproxy_user:
             try:
diff --git a/x2go/inifiles.py b/x2go/inifiles.py
index d659f09..5b4f56d 100644
--- a/x2go/inifiles.py
+++ b/x2go/inifiles.py
@@ -215,8 +215,8 @@ class X2GoIniFile(object):
                 fd.close()
                 self.write_user_config = False
                 return True
-            except:
-                pass
+            except Exception, e:
+                print e
         return False
 
     def get_type(self, section, key):


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