[X2Go-Commits] python-x2go.git - release/0.4.0.x (branch) updated: 0.1.1.4-30-gcf40811
X2Go dev team
git-admin at x2go.org
Tue Jan 7 16:17:25 CET 2014
The branch, release/0.4.0.x has been updated
via cf408110f4276e5451035ad59a389d726d46ed0a (commit)
from a20193b34efb6722373e08ee2f9e7b201eb4ae45 (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 | 2 ++
x2go/defaults.py | 2 +-
x2go/inifiles.py | 7 +++++--
3 files changed, 8 insertions(+), 3 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index e0a0c59..3d23291 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ python-x2go (0.1.1.6-0~x2go1) UNRELEASED; urgency=low
* New upstream version (0.1.1.6), bugfix release for 0.1.1.x series:
- Fix IPv4 enforcement for localhost connections.
- Be tolerant against trailing whitespaces in hostnames.
+ - Fix handling of lists in session profiles (i.e. ini files). Fixes breakage
+ with x2goclient's rootless vs. desktop mode after pyhoca-gui has been used.
-- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Mon, 11 Sep 2011 18:37:02 +0200
diff --git a/x2go/defaults.py b/x2go/defaults.py
index 17be0f1..b4a284c 100644
--- a/x2go/defaults.py
+++ b/x2go/defaults.py
@@ -276,7 +276,7 @@ X2GO_SESSIONPROFILE_DEFAULTS = {
'sound':False, 'soundsystem': 'pulse', 'startsoundsystem': False, 'soundtunnel':True, 'defsndport':True, 'sndport':4713,
'name': 'NEW_PROFILE', 'icon': ':icons/128x128/x2gosession.png',
'host': '', 'user': CURRENT_LOCAL_USER, 'key': '', 'sshport': 22,
- 'rootless': True, 'applications': str(X2GO_GENERIC_APPLICATIONS), 'command':'TERMINAL',
+ 'rootless': True, 'applications': X2GO_GENERIC_APPLICATIONS, 'command':'TERMINAL',
'rdpoptions': '-u X2GO_USER -p X2GO_PASSWORD', 'rdpserver': '',
'print': False,
'xdmcpserver': 'localhost',
diff --git a/x2go/inifiles.py b/x2go/inifiles.py
index cd5f21f..c95b2b2 100644
--- a/x2go/inifiles.py
+++ b/x2go/inifiles.py
@@ -156,9 +156,10 @@ class X2goIniFile(object):
"""
if type(value) == type(u''):
value = value.encode(utils.get_encoding())
-
if type(value) is types.BooleanType:
self.iniConfig.set(section, key, str(int(value)))
+ elif type(value) in (types.ListType, types.TupleType):
+ self.iniConfig.set(section, key, ", ".join(value))
else:
self.iniConfig.set(section, key, str(value))
@@ -249,8 +250,10 @@ class X2goIniFile(object):
val = self.iniConfig.get(section, key)
if val.startswith('[') and val.endswith(']'):
return eval(val)
+ elif ',' in val:
+ val = [ v.strip() for v in val.split(',') ]
else:
- raise TypeError
+ val = [ val ]
else:
_val = self.iniConfig.get(section, key)
return _val.decode(utils.get_encoding())
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).
More information about the x2go-commits
mailing list