The branch, master has been updated via 06e08a443f6c067ee48423ebb3d6fbda265478fd (commit) from aa9d494e669606926afaa0e7fbf78769596a771d (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 06e08a443f6c067ee48423ebb3d6fbda265478fd Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Sep 14 17:42:44 2012 +0200 Remove bashism from X2Go server command calls. Caused servers with no installed x2goserver-xsession package to crash desktop sessions (observed with KDE4 on Ubuntu 12.04). ----------------------------------------------------------------------- Summary of changes: debian/changelog | 3 +++ x2go/backends/terminal/_stdout.py | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 05cb804..357c215 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,9 @@ python-x2go (0.2.0.10-0~x2go1) UNRELEASED; urgency=low - Indentation fix in defaults.py. - Make Python X2Go aware of DirectRDP settings in session profiles. - Ignore DirectRDP options in session profile config for now. + - Remove bashism from X2Go server command calls. Caused servers + with no installed x2goserver-xsession package to crash desktop + sessions (observed with KDE4 on Ubuntu 12.04). -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Fri, 17 Aug 2012 18:29:04 +0200 diff --git a/x2go/backends/terminal/_stdout.py b/x2go/backends/terminal/_stdout.py index ef01b56..3df1491 100644 --- a/x2go/backends/terminal/_stdout.py +++ b/x2go/backends/terminal/_stdout.py @@ -1192,7 +1192,7 @@ class X2goTerminalSessionSTDOUT(object): _rewrite_blanks(_rewrite_cmd(cmd, params=self.params)), str(self.params.snd_system), str(self.params.session_type), - "&> /dev/null & exit", + "1>/dev/null 2>/dev/null & exit", ] if self.params.snd_system == 'pulse': @@ -1296,7 +1296,7 @@ class X2goTerminalSessionSTDOUT(object): cmd_line.extend( [ "setsid %s" % exec_name, - "&> /dev/null & exit", + "1>/dev/null 2>/dev/null & exit", ] ) 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).