[X2go-Commits] python-x2go.git - build-main (branch) updated: 0.2.0.2-1-g56223c3

[X2Go dev team]

The branch, build-main has been updated
       via  56223c33fa9c13bb64ffa0bb0d6c6bb4884651bc (commit)
      from  1e28d700dd71f9ff121f6ad702717020b95bade0 (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 56223c33fa9c13bb64ffa0bb0d6c6bb4884651bc
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/session.py  |    2 +-
 2 files changed, 9 insertions(+), 1 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index aabb0d9..5ee8965 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+python-x2go (0.2.0.3-0~x2go1) UNRELEASED; urgency=low
+
+  * 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>  Sun, 10 Jun 2012 05:20:51 +0200
+
 python-x2go (0.2.0.2-0~x2go1) unstable; urgency=low
 
   * Bugfix release (0.2.0.2):
diff --git a/x2go/session.py b/x2go/session.py
index 9368d96..b455a18 100644
--- a/x2go/session.py
+++ b/x2go/session.py
@@ -1051,7 +1051,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).