[X2Go-Commits] x2gobroker.git - tmp (branch) updated: b69d5fcb689bd60b49d0cd76cdaec96a4b22742e
X2Go dev team
git-admin at x2go.org
Tue Apr 23 21:08:34 CEST 2013
The branch, tmp has been updated
via b69d5fcb689bd60b49d0cd76cdaec96a4b22742e (commit)
from 4092800379a2df84aff513d0fdaeeb8ed7824800 (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/config.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
The diff of changes is:
diff --git a/x2gobroker/config.py b/x2gobroker/config.py
index 02d500d..a4c7f2f 100644
--- a/x2gobroker/config.py
+++ b/x2gobroker/config.py
@@ -37,6 +37,7 @@ import cStringIO
import x2gobroker.utils
from x2gobroker.defaults import X2GOBROKER_HOME as _X2GOBROKER_HOME
+from x2gobroker.defaults import X2GOBROKER_CONFIG as _X2GOBROKER_CONFIG
from x2gobroker.defaults import X2GOBROKER_CONFIG_DEFAULTS as _X2GOBROKER_CONFIG_DEFAULTS
class X2GoBrokerConfigFile(object):
@@ -60,7 +61,7 @@ class X2GoBrokerConfigFile(object):
write_user_config = False
user_config_file = None
- def __init__(self, config_files='/etc/x2go/x2gobroker.conf', defaults=None):
+ def __init__(self, config_files=_X2GOBROKER_CONFIG, defaults=None):
"""\
@param config_files: a list of configuration file names (e.g. a global filename and a user's home
directory filename)
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).
More information about the x2go-commits
mailing list