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

X2Go dev team git-admin at x2go.org
Sun Jun 10 21:59:15 CEST 2012


The branch, build-main has been updated
       via  ac55fa9376d7df1224e5017f910c7de49e1ad8f5 (commit)
       via  c8213242b5ea8c6958d75d18809961db1fe1bb36 (commit)
       via  593db5e3e63ccc5eafb2f20127bb2e0aa446c469 (commit)
       via  d615efb410598fc1115db958e2b3a1d026a0cf19 (commit)
       via  a3ab4c5091972d1c418c51a38506b43986d116ab (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

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

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index aabb0d9..d105c48 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+python-x2go (0.2.0.3-0~x2go1) unstable; 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 21:22:47 +0200
+
 python-x2go (0.2.0.2-0~x2go1) unstable; urgency=low
 
   * Bugfix release (0.2.0.2):
diff --git a/x2go/__init__.py b/x2go/__init__.py
index 3420925..e27c4bb 100644
--- a/x2go/__init__.py
+++ b/x2go/__init__.py
@@ -178,7 +178,7 @@ Contact
 """
 
 __NAME__    = 'python-x2go'
-__VERSION__ = '0.2.0.2'
+__VERSION__ = '0.2.0.3'
 
 from gevent import monkey
 monkey.patch_all()
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 9368d96..160ee53 100644
--- a/x2go/session.py
+++ b/x2go/session.py
@@ -362,9 +362,6 @@ class X2goSession(object):
         """\
         HOOK method: called if a control session (server connection) has unexpectedly encountered a failure.
 
-        @param profile_name: profile name of session that called this hook method
-        @type profile_name: C{str}
-
         """
         if self.client_instance:
             self.client_instance.HOOK_on_control_session_death(profile_name=self.profile_name)
@@ -1051,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).




More information about the x2go-commits mailing list