[X2Go-Commits] python-x2go.git - brokerclient (branch) updated: 0.4.0.8-11-g1b463da

[X2Go dev team]

The branch, brokerclient has been updated
       via  1b463da78fdd7fca76e27c44f41e3f02fcd20622 (commit)
      from  d3378ca11d1cc32dcdc81a5890d011cf958a0df8 (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:
 debian/changelog |    1 +
 x2go/session.py  |    8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 669f8da..76a4f9b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ python-x2go (0.4.0.9-0~x2go1) UNRELEASED; urgency=low
       requested.
     - Keep private key information even if force_password_auth is set in the
       control session's connect() method.
+    - Fix parameter handling in X2GoSession.connect().
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Wed, 07 Aug 2013 12:18:46 +0200
 
diff --git a/x2go/session.py b/x2go/session.py
index 065e85f..a42d710 100644
--- a/x2go/session.py
+++ b/x2go/session.py
@@ -1175,9 +1175,9 @@ class X2GoSession(object):
                     gevent.spawn(self.HOOK_auto_connect)
     __do_auto_connect = do_auto_connect
 
-    def connect(self, username='', password='', add_to_known_hosts=False, force_password_auth=False,
-                look_for_keys=None, allow_agent=None,
-                use_sshproxy=None, sshproxy_reuse_authinfo=False, sshproxy_user='', sshproxy_password='', sshproxy_force_password_auth=False):
+    def connect(self, username='', password='', add_to_known_hosts=None,
+                force_password_auth=None, look_for_keys=None, allow_agent=None,
+                use_sshproxy=None, sshproxy_user=None, sshproxy_password=None, sshproxy_force_password_auth=None, sshproxy_reuse_authinfo=None, ):
         """\
         Connects to the L{X2GoSession}'s server host. This method basically wraps around 
         the C{X2GoControlSession*.connect()} method.
@@ -1246,7 +1246,7 @@ class X2GoSession(object):
                 self.sshproxy_params['sshproxy_user'] = sshproxy_user
             if sshproxy_password:
                 self.sshproxy_params['sshproxy_password'] = sshproxy_password
-            if sshproxy_force_password_auth:
+            if sshproxy_force_password_auth is not None:
                 self.sshproxy_params['sshproxy_force_password_auth'] = sshproxy_force_password_auth
 
             self.control_params['password'] = password


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).