[X2Go-Commits] python-x2go.git - twofactorauth (branch) updated: 0.1.1.4-263-g086c072

[X2Go dev team]

The branch, twofactorauth has been updated
       via  086c072e295108806cb0b499885ef4d07fee1fec (commit)
      from  e62710c866e0a6fde03337608ff7a4de5e633767 (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:
 x2go/client.py |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

The diff of changes is:
diff --git a/x2go/client.py b/x2go/client.py
index 9585253..94e5c7d 100644
--- a/x2go/client.py
+++ b/x2go/client.py
@@ -193,6 +193,7 @@ class X2goClient(object):
                  ssh_rootdir=None,
                  start_xserver=False,
                  start_pulseaudio=False,
+                 use_cache=False,
                  use_listsessions_cache=False, 
                  auto_update_listsessions_cache=False,
                  auto_update_listdesktops_cache=False,
@@ -229,6 +230,8 @@ class X2goClient(object):
         @type start_xserver: C{bool}
         @param start_pulseaudio: start Pulseaudio daemon when registering an L{X2goClient} instance
         @type start_pulseaudio: C{bool}
+        @param use_cache: alias for C{use_listsessions_cache}
+        @type use_cache: C{bool}
         @param use_listsessions_cache: activate the X2Go session list cache in (L{X2goListSessionsCache})
         @type use_listsessions_cache: C{bool}
         @param auto_update_listsessions_cache: activate automatic updates of the X2Go session list cache (L{X2goListSessionsCache})
@@ -344,7 +347,7 @@ class X2goClient(object):
 
         self.auto_register_sessions = auto_register_sessions
         self.session_registry = X2goSessionRegistry(self, logger=self.logger)
-        self.session_guardian = X2goSessionGuardian(self, auto_update_listsessions_cache=auto_update_listsessions_cache & use_listsessions_cache,
+        self.session_guardian = X2goSessionGuardian(self, auto_update_listsessions_cache=auto_update_listsessions_cache & (use_listsessions_cache|use_cache),
                                                     auto_update_listdesktops_cache=auto_update_listdesktops_cache & use_listsessions_cache,
                                                     auto_update_listmounts_cache=auto_update_listmounts_cache & use_listsessions_cache,
                                                     auto_update_sessionregistry=auto_update_sessionregistry,
@@ -357,7 +360,7 @@ class X2goClient(object):
         if use_listsessions_cache:
             self.listsessions_cache = X2goListSessionsCache(self, logger=self.logger)
 
-        self.use_listsessions_cache = use_listsessions_cache
+        self.use_listsessions_cache = use_listsessions_cache | use_cache
         self.auto_update_listsessions_cache = auto_update_listsessions_cache
         self.auto_update_listdesktops_cache = auto_update_listdesktops_cache
         self.auto_update_listmounts_cache = auto_update_listmounts_cache


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