Home
Reading
Searching
Subscribe
Sponsors
Statistics
Posting
Contact
Spam
Lists
Links
About
Hosting
Filtering
Features Download
Marketing
Archives
FAQ
Blog
 
Gmane
From: X2Go dev team <git-admin-P0WSJaAXTow <at> public.gmane.org>
Subject: x2gobroker.git - master (branch) updated: 0.0.0.1-45-gf703bae
Newsgroups: gmane.linux.terminal-server.x2go.scm
Date: Wednesday 20th February 2013 23:55:50 UTC (over 3 years ago)
The branch, master 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 -----------------------------------------------------------------
commit f703baeb847d1ac9c877faee34f93e08e0af22d6
Author: Mike Gabriel

Date:   Thu Feb 21 00:58:26 2013 +0100

    fine-tuning of the select_session handshake

-----------------------------------------------------------------------

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
 
CD: 8ms