[X2go-Commits] x2gobroker.git - master (branch) updated: 0.0.0.5-31-g8b21beb

[X2Go dev team]

The branch, master has been updated
       via  8b21bebbe426c5fc64b692933072e99724f479b2 (commit)
      from  428601765689aafc634b6be05b4619e7583cf2e6 (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 8b21bebbe426c5fc64b692933072e99724f479b2
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat Mar 2 16:21:21 2013 +0100

    make selectsession task more robust if there are broker session infos in the X2Go session DB

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

Summary of changes:
 x2gobroker/brokers/base_broker.py |   19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

The diff of changes is:
diff --git a/x2gobroker/brokers/base_broker.py b/x2gobroker/brokers/base_broker.py
index 4bfd39f..c3dbc7f 100644
--- a/x2gobroker/brokers/base_broker.py
+++ b/x2gobroker/brokers/base_broker.py
@@ -841,13 +841,20 @@ class X2GoBroker(object):
             if session_list:
 
                 # 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]
+                try:
+                    server_name = session_list[0].split('|')[3]
+                    session_info = session_list[0]
+
+                    selected_session.update({
+                        'server': server_name,
+                        'session_info': session_info,
+                    })
+
+                except IndexError:
+
+                    # FIXME: if we get here, we have to deal with a broker session info entry in the X2Go session database
+                    pass
 
-                selected_session.update({
-                    'server': server_name,
-                    'session_info': session_info,
-                })
 
         # session autologin feature
         if self.use_session_autologin(profile_id):


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