[X2Go-Commits] x2gobroker.git - build-main (branch) updated: 49855e399037e5508d1f1071862924446ae8d46f

[X2Go dev team]

The branch, build-main has been updated
       via  49855e399037e5508d1f1071862924446ae8d46f (commit)
      from  7187c80ce5733dc8d4c5d6294661299076e9bc44 (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:
 x2gobroker/backends/base.py |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

The diff of changes is:
diff --git a/x2gobroker/backends/base.py b/x2gobroker/backends/base.py
index 9a1d133..7919e2b 100644
--- a/x2gobroker/backends/base.py
+++ b/x2gobroker/backends/base.py
@@ -31,6 +31,7 @@ import pam
 
 # X2Go Broker modules
 import x2gobroker.config
+import x2gobroker.defaults
 
 class X2GoBroker(object):
     """\
@@ -47,13 +48,13 @@ class X2GoBroker(object):
 
     backend_name = 'base'
 
-    def __init__(self, config_file="/etc/x2go/x2gobroker.conf"):
+    def __init__(self, config_file="/etc/x2go/x2gobroker.conf", config_defaults=x2gobroker.defaults.X2GOBROKER_CONFIG_DEFAULTS):
         """\
         Initialize a new X2GoBroker instance to control X2Go session through an
         X2Go Client with an intermediate session broker.
 
         """
-        self.config = x2gobroker.config.X2GoBrokerConfigFile(config_files=config_file)
+        self.config = x2gobroker.config.X2GoBrokerConfigFile(config_files=config_file, defaults=config_defaults)
 
         self._dynamic_authid_map = {}
 


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