[X2Go-Commits] x2gobroker.git - build-main (branch) updated: 0.0.0.1-45-gf703bae

[X2Go dev team]

The branch, build-main has been updated
       via  f703baeb847d1ac9c877faee34f93e08e0af22d6 (commit)
      from  62675904dff3890b3cd24cc9d819d4040bd38530 (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:
 x2gobroker/agent.py               |    4 +++-
 x2gobroker/brokers/base_broker.py |    2 +-
 x2gobroker/web/plain.py           |    4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

The diff of changes is:
diff --git a/x2gobroker/agent.py b/x2gobroker/agent.py
index 1192063..d055079 100644
--- a/x2gobroker/agent.py
+++ b/x2gobroker/agent.py
@@ -50,7 +50,9 @@ def call_local_broker_agent(username, mode):
                                      shell=False,
     )
 
-    return agent_process.stdout.read().split('\n')
+    result = agent_process.stdout.read().split('\n')
+    if result[0].startswith('OK'):
+        return result[1:]
 
 def call_remote_broker_agent(username, mode, remote_agent):
     """\
diff --git a/x2gobroker/brokers/base_broker.py b/x2gobroker/brokers/base_broker.py
index 54d68e6..9e811c0 100644
--- a/x2gobroker/brokers/base_broker.py
+++ b/x2gobroker/brokers/base_broker.py
@@ -770,7 +770,7 @@ class X2GoBroker(object):
 
                 # if resuming, always select the first session in the list, there should only be one suspended session
                 server_name = session_list[0].split('|')[3]
-                session_info = session_list[0].split('|')[1]
+                session_info = session_list[0]
 
                 selected_session.update({
                     'server': server_name,
diff --git a/x2gobroker/web/plain.py b/x2gobroker/web/plain.py
index 70ce4a6..2e88de9 100644
--- a/x2gobroker/web/plain.py
+++ b/x2gobroker/web/plain.py
@@ -156,8 +156,8 @@ class X2GoBrokerWebPlain:
                         if profile_info.has_key('authentication_key'):
                             output += ""
                         if profile_info.has_key('session_info'):
-                            output += "SESSION_INFOS:\n"
-                            output += "\n".join(profile_info['session_info']) + "\n"
+                            output += "SESSION_INFO:"
+                            output += profile_info['session_info'] + "\n"
 
             return output
 


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).