[X2Go-Commits] x2gobroker.git - build-main (branch) updated: 0.0.1.0-44-gabc7296
X2Go dev team
git-admin at x2go.org
Sun May 19 13:05:19 CEST 2013
The branch, build-main has been updated
via abc72963617a4c27b376efacbc46cfbe4de4237a (commit)
from 7da7e324930cf1e2265672853609746244fa374e (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:
debian/changelog | 1 +
x2gobroker/defaults.py | 1 +
x2gobroker/tests/test_broker_base.py | 1 +
3 files changed, 3 insertions(+)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index b497da4..39d3dfd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,7 @@ x2gobroker (0.0.1.1-0~x2go1) UNRELEASED; urgency=low
- Add script: x2gobroker-testauth.
- Add enable()/disable() methods to broker backends.
- Move complete authservice logic into x2gobroker-authservice script.
+ - Add cmd and directrdp session profile parameters to defaults.
* /debian/control:
+ Fix --root parameter in DEB_PYTHON_INSTALL_ARGS.
+ Let bin:package x2gobroker-authservice depend on python-x2gobroker (of the
diff --git a/x2gobroker/defaults.py b/x2gobroker/defaults.py
index 0c7c2c5..ca70e82 100644
--- a/x2gobroker/defaults.py
+++ b/x2gobroker/defaults.py
@@ -160,6 +160,7 @@ X2GOBROKER_CONFIG_DEFAULTS = {
# defaults for X2Go Sessino Broker session profiles file
X2GOBROKER_SESSIONPROFILE_DEFAULTS = {
u'DEFAULT': {
+ u'cmd': u'TERMINAL',
u'defsndport': True,
u'useiconv': False,
u'iconvfrom': u'UTF-8',
diff --git a/x2gobroker/tests/test_broker_base.py b/x2gobroker/tests/test_broker_base.py
index 0bda18e..ac710b8 100644
--- a/x2gobroker/tests/test_broker_base.py
+++ b/x2gobroker/tests/test_broker_base.py
@@ -274,6 +274,7 @@ check-credentials = false
def test_getdefaultprofile(self):
base_backend = self._init_base_backend()
_expected_profile = {
+ 'cmd': 'TERMINAL',
'defsndport': True,
'useiconv': False,
'iconvfrom': 'UTF-8',
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