[X2go-Commits] pyhoca-gui.git - master (branch) updated: 0.2.0.4-20-gd2ed0cc

[X2Go dev team]

The branch, master has been updated
       via  d2ed0cc4ebcfc26835533fa4d9009692b08f2a2d (commit)
       via  77b0b0f9deb978ccabd99a0c4cc346c4f488c0ae (commit)
       via  9d891f82dd2fee56ecb5f8774315340fdd0a19ce (commit)
      from  f7c2451f34638bc25b1f3485e5c360fac3243cd1 (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 d2ed0cc4ebcfc26835533fa4d9009692b08f2a2d
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Sep 26 21:02:23 2012 +0200

    Depend on python-x2go (>=0.2.0.11-0~).

commit 77b0b0f9deb978ccabd99a0c4cc346c4f488c0ae
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Sep 26 20:59:51 2012 +0200

    Configure SSH proxy port in a separate session profile option (sshproxyport).

commit 9d891f82dd2fee56ecb5f8774315340fdd0a19ce
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Sep 25 20:17:44 2012 +0200

    Reduce python version in Build-Depends to allow build against Ubuntu 10.04.

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

Summary of changes:
 debian/changelog               |    4 +++-
 debian/control                 |    4 ++--
 pyhoca/wxgui/profilemanager.py |   17 +++++++++++++++--
 3 files changed, 20 insertions(+), 5 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 088f0b3..4dbda61 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,9 +17,11 @@ pyhoca-gui (0.2.0.5-0~x2go1) UNRELEASED; urgency=low
       in.
     - Do not offer DirectRDP sessions in profile manager while connected to a real
       X2Go server via SSH.
+    - Configure SSH proxy port in a separate session profile option (sshproxyport).
   * /debian/control:
     + Add Oleksandr Shneyder to Uploaders.
-    + Depend on python-x2go (>=0.2.0.10-0~).
+    + Depend on python-x2go (>=0.2.0.11-0~).
+    + Reduce python version in Build-Depends to allow build against Ubuntu 10.04.
   * Maintainer change in package: X2Go Developers <x2go-dev at lists.berlios.de>.
 
   [ Oleksandr Shneyder ]
diff --git a/debian/control b/debian/control
index b823f63..fcfdd9a 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Uploaders:
 Build-Depends: 
  debhelper (>= 7.0.50~),
  man2html-base | man2html,
- python (>=2.6.6-3~),
+ python (>=2.6.5-0~),
  python-setuptools,
  python-support,
  python-distutils-extra,
@@ -30,7 +30,7 @@ Architecture: all
 Depends: 
  ${misc:Depends},
  python,
- python-x2go (>=0.2.0.10-0~),
+ python-x2go (>=0.2.0.11-0~),
  python-argparse,
  python-notify,
  python-setproctitle,
diff --git a/pyhoca/wxgui/profilemanager.py b/pyhoca/wxgui/profilemanager.py
index 2e9449b..95566cc 100644
--- a/pyhoca/wxgui/profilemanager.py
+++ b/pyhoca/wxgui/profilemanager.py
@@ -834,7 +834,14 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
         self.UseSSHProxy.SetValue(self.profile_config['usesshproxy'])
 
         _ssh_proxy = self.profile_config['usesshproxy']
-        self.SSHProxyHost.SetValue(self.profile_config['sshproxyhost'])
+        _ssh_proxy_host = self.profile_config['sshproxyhost']
+        _ssh_proxy_port = 22
+        if ":" in _ssh_proxy_host:
+            _ssh_proxy_port = _ssh_proxy_host.split(":")[1]
+            _ssh_proxy_host = _ssh_proxy_host.split(":")[0]
+        if self.profile_config['sshproxyport']:
+            _ssh_proxy_port = int(self.profile_config['sshproxyport'])
+        self.SSHProxyHost.SetValue("%s:%s" % (_ssh_proxy_host, _ssh_proxy_port))
         self.SSHProxyUser.SetValue(self.profile_config['sshproxyuser'])
         self.SSHProxyKeyFile.SetValue(self.profile_config['sshproxykeyfile'])
 
@@ -1201,7 +1208,13 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
             self.profile_config['host'] = self.Host.GetValue()
             if _session_type != 'DirectRDP':
                 self.profile_config['sshport'] = self.SSHPort.GetValue()
-        self.profile_config['sshproxyhost'] = self.SSHProxyHost.GetValue()
+        _ssh_proxy_host = self.SSHProxyHost.GetValue()
+        _ssh_proxy_port = 22
+        if ":" in _ssh_proxy_host:
+            _ssh_proxy_port = _ssh_proxy_host.split(":")[1]
+            _ssh_proxy_host = _ssh_proxy_host.split(":")[0]
+        self.profile_config['sshproxyhost'] = _ssh_proxy_host
+        self.profile_config['sshproxyport'] = _ssh_proxy_port
         self.profile_config['sshproxyuser'] = self.SSHProxyUser.GetValue()
         self.profile_config['sshproxytunnel'] = '%s:%s:%s:%s' % (self.SSHProxyTunnelFromHost.GetValue(),
                                                                  self.SSHProxyTunnelFromPort.GetValue(),


hooks/post-receive
-- 
pyhoca-gui.git (Python X2Go Client (wxPython GUI))

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 "pyhoca-gui.git" (Python X2Go Client (wxPython GUI)).