X2Go dev team | 17 Jan 11:24 2013

python-x2go.git - master (branch) updated: 0.2.1.1-32-g3133baf

The branch, master has been updated
       via  3133baf8a3c0e8dc6d80bad8d5aef6b0d0f34862 (commit)
       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 -----------------------------------------------------------------
commit 3133baf8a3c0e8dc6d80bad8d5aef6b0d0f34862
Author: Mike Gabriel <mike.gabriel@...>
Date:   Thu Jan 17 11:24:29 2013 +0100

    return success of writing a session profile configuration to disk

commit eb0cf279859b9ac49f72cda07b8ca7730dfe7a7e
Author: Mike Gabriel <mike.gabriel@...>
Date:   Thu Jan 17 11:17:08 2013 +0100

    only prep fake_hostname if unique_hostkey_aliases is set to True

-----------------------------------------------------------------------

Summary of changes:
 x2go/backends/control/_stdout.py |    3 ++-
 x2go/backends/profiles/_file.py  |    2 +-
 x2go/inifiles.py                 |    4 ++--
 3 files changed, 5 insertions(+), 4 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
 <at>  <at>  -732,7 +732,8  <at>  <at>  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/backends/profiles/_file.py b/x2go/backends/profiles/_file.py
index fcf678f..5320299 100644
--- a/x2go/backends/profiles/_file.py
+++ b/x2go/backends/profiles/_file.py
 <at>  <at>  -159,7 +159,7  <at>  <at>  class X2GoSessionProfilesFILE(inifiles.X2GoIniFile):
         self._profiles_need_profile_id_renewal = []

         # at last write the profile config as is...
-        inifiles.X2GoIniFile.write(self)
+        return inifiles.X2GoIniFile.write(self)

 
     def get_profile_option_type(self, option):
diff --git a/x2go/inifiles.py b/x2go/inifiles.py
index d659f09..5b4f56d 100644
--- a/x2go/inifiles.py
+++ b/x2go/inifiles.py
 <at>  <at>  -215,8 +215,8  <at>  <at>  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

Gmane