This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gobroker. commit aad4338a4688086becbf0dd4b4742d2397120978 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue May 8 10:13:11 2018 +0200 infile broker backend: Fix handling of empty lists in session profile and session profile defaults. --- x2gobroker/brokers/inifile_broker.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/x2gobroker/brokers/inifile_broker.py b/x2gobroker/brokers/inifile_broker.py index 0f0894d..45f0a8c 100644 --- a/x2gobroker/brokers/inifile_broker.py +++ b/x2gobroker/brokers/inifile_broker.py @@ -64,6 +64,9 @@ class X2GoBroker(base.X2GoBroker): for key in list(profile_defaults.keys()): if key.startswith('acl-'): del profile_defaults[key] + elif type(profile_defaults[key]) == list: + profile_defaults.update({ key: [ v for v in profile_defaults[key] if v ] }) + return profile_defaults def get_profile(self, profile_id): @@ -77,6 +80,8 @@ class X2GoBroker(base.X2GoBroker): for key in list(profile_defaults.keys()): if key not in list(profile.keys()): profile.update({ key: profile_defaults[key] }) + if type(profile_defaults[key]) == list: + profile.update({ key: [ v for v in profile[key] if v ] }) for key in list(profile.keys()): if key.startswith('acl-'): -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git