The branch, master-inai has been updated via 537b3ae070b91abb24310ea17eb90637e8c093df (commit) from c37de1ec00c8790cb5f4c7258ae12021e3d38c7a (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/inifile.py | 3 ++- x2gobroker/defaults.py | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/x2gobroker/backends/inifile.py b/x2gobroker/backends/inifile.py index 247234f..6505150 100644 --- a/x2gobroker/backends/inifile.py +++ b/x2gobroker/backends/inifile.py @@ -30,6 +30,7 @@ __NAME__ = 'x2gobroker-pylib' # Python X2GoBroker modules import base import x2gobroker.config +import x2gobroker.defaults class X2GoBroker(base.X2GoBroker): """\ @@ -39,7 +40,7 @@ class X2GoBroker(base.X2GoBroker): backend_name = 'inifile' - def __init__(self, profile_config='/etc/x2go/x2gobroker-sessionprofiles.conf', **kwargs): + def __init__(self, profile_config=x2gobroker.defaults.X2GOBROKER_SESSIONPROFILES, **kwargs): """\ @param config_file: path to the X2Go Session Broker configuration file (x2gobroker.conf) diff --git a/x2gobroker/defaults.py b/x2gobroker/defaults.py index 25b3e6f..5a10a95 100644 --- a/x2gobroker/defaults.py +++ b/x2gobroker/defaults.py @@ -31,6 +31,11 @@ if os.environ.has_key('X2GOBROKER_CONFIG'): else: X2GOBROKER_CONFIG="/etc/x2go/x2gobroker.conf" +if os.environ.has_key('X2GOBROKER_SESSIONPROFILES'): + X2GOBROKER_SESSIONPROFILES=os.environ['X2GOBROKER_SESSIONPROFILES'] +else: + X2GOBROKER_SESSIONPROFILES="/etc/x2go/x2gobroker-sessionprofiles.conf" + if os.environ.has_key('X2GOBROKER_AGENT_CMD'): X2GOBROKER_AGENT_CMD=os.environ['X2GOBROKER_AGENT_CMD'] else: 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).