[X2Go-Commits] x2gobroker.git - master (branch) updated: 0.0.2.3-33-g324b5ab

[X2Go dev team]

The branch, master has been updated
       via  324b5abc92c9c242ebb6410b3938232055b73920 (commit)
      from  9c790bec8229c1f6ea6fec0e13a64d6e3b0afb69 (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 324b5abc92c9c242ebb6410b3938232055b73920
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Sep 25 12:57:04 2013 +0200

    Rename base broker's use_session_autologin to get_session_autologin.

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

Summary of changes:
 debian/changelog                  |    1 +
 x2gobroker/brokers/base_broker.py |    8 +++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 26a2140..4ae73c2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,7 @@ x2gobroker (0.0.3.0-0~x2go1) UNRELEASED; urgency=low
       that will work with every default setup.
     - New broker session profile parameter: broker-agent-query-mode. Define
       agent query methods per session profile.
+    - Rename base broker's use_session_autologin to get_session_autologin.
   * /debian/control:
     + Replace LDAP support with session brokerage support in LONG_DESCRIPTION.
   * /debian/x2gobroker-agent.dirs:
diff --git a/x2gobroker/brokers/base_broker.py b/x2gobroker/brokers/base_broker.py
index aedce6f..380e479 100644
--- a/x2gobroker/brokers/base_broker.py
+++ b/x2gobroker/brokers/base_broker.py
@@ -489,7 +489,7 @@ class X2GoBroker(object):
 
         return unicode(_agent_query_mode) or unicode(_backend_agent_query_mode) or unicode(_default_agent_query_mode)
 
-    def use_session_autologin(self, profile_id):
+    def get_session_autologin(self, profile_id):
         """\
         Detect if the given profile is configured to try automatic session
         logons.
@@ -510,6 +510,8 @@ class X2GoBroker(object):
             logger_broker.debug('base_broker.X2GoBroker.get_session_autologin(): found default-session-autologin in global config section: {value}'.format(value=_default_session_autologin))
 
         return _session_autologin or _default_session_autologin
+    # API compat name:
+    use_session_autologin = get_session_autologin
 
     def get_authorized_keys_file(self, profile_id):
         """\
@@ -858,7 +860,7 @@ class X2GoBroker(object):
                 if key.startswith('host='):
                     del profile[key]
 
-            if self.use_session_autologin(profile_id):
+            if self.get_session_autologin(profile_id):
                 profile['autologin'] = True
                 profile['key'] = '<will-be-provided-later>'
 
@@ -1023,7 +1025,7 @@ class X2GoBroker(object):
 
 
         # session autologin feature
-        if remote_agent and self.use_session_autologin(profile_id) and username:
+        if remote_agent and self.get_session_autologin(profile_id) and username:
 
             # FIXME: we somehow have to find out about the username of the person at the broker client-side...
             # using the username used for broker login for now...


hooks/post-receive
-- 
x2gobroker.git (HTTP(S) Session broker for X2Go)

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 "x2gobroker.git" (HTTP(S) Session broker for X2Go).