[X2go-Commits] python-x2go.git - master (branch) updated: 0.2.0.2-5-gac55fa9

[X2Go dev team]

The branch, master has been updated
       via  ac55fa9376d7df1224e5017f910c7de49e1ad8f5 (commit)
       via  c8213242b5ea8c6958d75d18809961db1fe1bb36 (commit)
       via  593db5e3e63ccc5eafb2f20127bb2e0aa446c469 (commit)
      from  d615efb410598fc1115db958e2b3a1d026a0cf19 (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 ac55fa9376d7df1224e5017f910c7de49e1ad8f5
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun Jun 10 21:22:57 2012 +0200

    release 0.2.0.3

commit c8213242b5ea8c6958d75d18809961db1fe1bb36
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun Jun 10 09:04:18 2012 +0200

    whitespace fix

commit 593db5e3e63ccc5eafb2f20127bb2e0aa446c469
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun Jun 10 05:22:45 2012 +0200

    Only notify HOOK_auto_connect, if the session really is configured to auto-connect (while at the same time no SSH key is present).

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

Summary of changes:
 debian/changelog |    8 +++++---
 x2go/client.py   |    1 +
 x2go/session.py  |    2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 252e6b9..d105c48 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
-python-x2go (0.2.0.3-0~x2go1) UNRELEASED; urgency=low
+python-x2go (0.2.0.3-0~x2go1) unstable; urgency=low
 
-  * Continue development...
+  * Bugfix release (0.2.0.3):
+    - Only notify HOOK_auto_connect, if the session really is configured
+      to auto-connect (while at the same time no SSH key is present).
 
- -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Fri, 08 Jun 2012 09:39:21 +0200
+ -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Sun, 10 Jun 2012 21:22:47 +0200
 
 python-x2go (0.2.0.2-0~x2go1) unstable; urgency=low
 
diff --git a/x2go/client.py b/x2go/client.py
index e568112..c9527bb 100644
--- a/x2go/client.py
+++ b/x2go/client.py
@@ -463,6 +463,7 @@ class X2goClient(object):
         @type fingerprint: C{str}
         @param fingerprint_type: finger print type (like RSA, DSA, ...)
         @type fingerprint_type: C{str}
+
         @return: if host validity is verified, this hook method should return C{True}
         @rtype: C{bool}
 
diff --git a/x2go/session.py b/x2go/session.py
index c79966e..160ee53 100644
--- a/x2go/session.py
+++ b/x2go/session.py
@@ -1048,7 +1048,7 @@ class X2goSession(object):
             else:
                 if self.can_auto_connect() and self.auto_connect:
                     gevent.spawn(self.connect)
-                else:
+                elif self.auto_connect:
                     gevent.spawn(self.HOOK_auto_connect)
 
     def connect(self, username='', password='', add_to_known_hosts=False, force_password_auth=False,


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