This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gobroker. commit b481e3d4c606e409b3e0bef16d04166dcbba6806 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Oct 22 11:00:07 2014 +0200 Use hostname as hard-coded in server_list (from session profile configuration), don't try to strip off the domain name. --- debian/changelog | 2 ++ x2gobroker/brokers/base_broker.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index cdb19c9..28082c1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -163,6 +163,8 @@ x2gobroker (0.0.3.0-0x2go1) UNRELEASED; urgency=low - Update copyright holders. Copyright is held only by people who actually contributed to the current code base. - logrotate configs: Rotated logs via "su x2gobroker adm". + - Use hostname as hard-coded in server_list (from session profile configuration), + don't try to strip off the domain name. * 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 6b5a929..9473c70 100644 --- a/x2gobroker/brokers/base_broker.py +++ b/x2gobroker/brokers/base_broker.py @@ -1097,7 +1097,7 @@ class X2GoBroker(object): running_sessions = [] suspended_sessions = [] for session_info in session_list: - session_host, session_domain = session_info.split('|')[3].split('.', 1) + session_host = session_info.split('|')[3] if session_host in server_list: if session_info.split('|')[4] == 'R': running_sessions.append(session_info) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git