[X2Go-Commits] python-x2go.git - build-baikal (branch) updated: 6fb22cf595864a6c33e7d0c781f75a3f5459a6db
X2Go dev team
git-admin at x2go.org
Wed Jan 8 15:25:24 CET 2014
The branch, build-baikal has been updated
via 6fb22cf595864a6c33e7d0c781f75a3f5459a6db (commit)
from cb2e61eaec1ce60a531ab739297055c20c4962c0 (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:
x2go/backends/info/stdout.py | 38 ++++++++++++++++++++++----------------
1 file changed, 22 insertions(+), 16 deletions(-)
The diff of changes is:
diff --git a/x2go/backends/info/stdout.py b/x2go/backends/info/stdout.py
index c3c431a..92c0739 100644
--- a/x2go/backends/info/stdout.py
+++ b/x2go/backends/info/stdout.py
@@ -44,22 +44,28 @@ class X2goServerSessionInfoSTDOUT(object):
Parse a single line of X2go's listsessions output.
"""
- l = x2go_output.split("|")
- self.name = l[1]
- self.cookie = l[6]
- self.agent_pid = int(l[0])
- self.display = int(l[2])
- self.status = l[4]
- self.graphics_port = int(l[8])
- self.snd_port = int(l[9])
- self.sshfs_port = int(l[13])
- self.username = l[11]
- self.hostname = l[3]
- # TODO: turn into datetime object
- self.date_created = l[5]
- # TODO: turn into datetime object
- self.date_suspended = l[10]
- self.local_container = ''
+ try:
+ l = x2go_output.split("|")
+ self.name = l[1]
+ self.cookie = l[6]
+ self.agent_pid = int(l[0])
+ self.display = int(l[2])
+ self.status = l[4]
+ self.graphics_port = int(l[8])
+ self.snd_port = int(l[9])
+ self.sshfs_port = int(l[13])
+ self.username = l[11]
+ self.hostname = l[3]
+ # TODO: turn into datetime object
+ self.date_created = l[5]
+ # TODO: turn into datetime object
+ self.date_suspended = l[10]
+ self.local_container = ''
+ except IndexError, e:
+ # DEBUGGING CODE
+ print 'Encountered IndexError: %s' % str(e)
+ print 'THIS SHOULD NOT HAPPEN... HERE IS THE x2golistsessions OUTPUT THAT CAUSED THE ERROR...'
+ print x2go_output
def is_running(self):
hooks/post-receive
--
python-x2go.git (Python X2Go Client API)
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 "python-x2go.git" (Python X2Go Client API).
More information about the x2go-commits
mailing list