[X2Go-Commits] [x2gobroker] 01/01: Transliterate commands in session profiles to uppercase when checking if the command is supposed to launch a desktop session.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2gobroker.

commit 46784d16a43eebe3b90090d8d1aafb69d9e37ccf
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue May 19 09:23:29 2015 +0200

    Transliterate commands in session profiles to uppercase when checking if the command is supposed to launch a desktop session.
---
 debian/changelog                  |    2 ++
 x2gobroker/brokers/base_broker.py |    2 +-
 x2gobroker/defaults.py            |    2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 8918ed7..5b00000 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -322,6 +322,8 @@ x2gobroker (0.0.3.0-0x2go1) UNRELEASED; urgency=low
     - agent.py: Fix missing "task" parameter for task "ping" against a local
       broker agent.
     - Fix task ping when tested via the x2gobroker-testagent script.
+    - Transliterate commands in session profiles to uppercase when checking if
+      the command is supposed to launch a desktop session.
   * debian/control:
     + Provide separate bin:package for SSH brokerage: x2gobroker-ssh.
     + Replace LDAP support with session brokerage support in LONG_DESCRIPTION.
diff --git a/x2gobroker/brokers/base_broker.py b/x2gobroker/brokers/base_broker.py
index bc2a6e5..a618c24 100644
--- a/x2gobroker/brokers/base_broker.py
+++ b/x2gobroker/brokers/base_broker.py
@@ -1249,7 +1249,7 @@ class X2GoBroker(object):
                 profile['key'] = u'<will-be-exchanged-during-session-selection>'
 
             # make sure that desktop sessions (that we know by name) do run with rootless=false
-            if profile['command'] in x2gobroker.defaults.X2GO_DESKTOP_SESSIONS:
+            if profile['command'].upper() in x2gobroker.defaults.X2GO_DESKTOP_SESSIONS:
                 profile['rootless'] = False
 
             remote_agent = self.get_remote_agent(profile_id)
diff --git a/x2gobroker/defaults.py b/x2gobroker/defaults.py
index 596d38c..0e55ee1 100644
--- a/x2gobroker/defaults.py
+++ b/x2gobroker/defaults.py
@@ -269,6 +269,8 @@ X2GO_DESKTOP_SESSIONS= [
     'LXDE',
     'TRINITY',
     'UNITY',
+    'ICEWM',
+    'OPENBOX',
     'XDMCP',
 ]
 

--
Alioth's /srv/git/code.x2go.org/x2gobroker.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git