[X2go-Commits] python-x2go.git - master (branch) updated: 0.1.1.4-210-g98ba5f2

X2Go dev team git-admin at x2go.org
Wed Apr 18 10:36:50 CEST 2012


The branch, master has been updated
       via  98ba5f24c29ce9ac2ae4129b2ade74dbb515cd21 (commit)
      from  38a2aa49b61bb51a1fbcb700de9bf1d58560e0d1 (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 98ba5f24c29ce9ac2ae4129b2ade74dbb515cd21
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Apr 18 10:36:47 2012 +0200

    os.environ elements can only be strings

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

Summary of changes:
 x2go/client.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

The diff of changes is:
diff --git a/x2go/client.py b/x2go/client.py
index 3968bb1..4ee4c00 100644
--- a/x2go/client.py
+++ b/x2go/client.py
@@ -319,7 +319,7 @@ class X2goClient(object):
                         # FIXME: this trick is nasty, client implementation should rather cleanly shutdown launch X-server processes
                         # 
                         # re-use a left behind X-server instance of a previous/crashed run of Python X2Go Client
-                        os.environ.update({'DISPLAY': p_xs[1]['display']})
+                        os.environ.update({'DISPLAY': str(p_xs[1]['display'])})
                     else:
                         # presume the running XServer listens on :0
                         os.environ.update({'DISPLAY': 'localhost:0'})


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