[X2Go-Commits] python-x2go.git - brokerclient (branch) updated: 05dbe3742b2483b5c238960e3d2f7eac9c8228c4
X2Go dev team
git-admin at x2go.org
Tue Jan 7 16:19:47 CET 2014
The branch, brokerclient has been updated
via 05dbe3742b2483b5c238960e3d2f7eac9c8228c4 (commit)
from 203b7cb65ff266f47508681fdce91fb1a345ad17 (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/xserver.py | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
The diff of changes is:
diff --git a/x2go/xserver.py b/x2go/xserver.py
index 4da260e..850dcd7 100644
--- a/x2go/xserver.py
+++ b/x2go/xserver.py
@@ -191,7 +191,11 @@ class X2goXServer(threading.Thread):
cmd_line = [self.xserver_config['run_command']]
cmd_line.extend(self.xserver_config['parameters'])
self.logger('starting XServer ,,%s\'\' with command line: %s' % (self.xserver_name, ' '.join(cmd_line)), loglevel=log.loglevel_DEBUG)
- p = subprocess.Popen(cmd_line, shell=False)
+ p = subprocess.Popen(cmd_line,
+ stdout=subprocess.PIPE,
+ stderr=subprocess.STDOUT,
+ shell=False,
+ )
while self._keepalive:
gevent.sleep(1)
self.logger('terminating running XServer ,,%s\'\'' % self.xserver_name, loglevel=log.loglevel_DEBUG)
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