The branch, release/0.1.1.x has been updated via 670e3d0355cc32ae0678156e1544c5bd0aeb1f10 (commit) via 0cbb6adeb83487872c9786d3311883c89345bd15 (commit) from 7be509ca50a0767fd13f9a358b18cde3e44a3d0d (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 670e3d0355cc32ae0678156e1544c5bd0aeb1f10 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Aug 15 21:49:49 2011 +0200 typo fix (with impact) commit 0cbb6adeb83487872c9786d3311883c89345bd15 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Aug 15 21:17:29 2011 +0200 launch the x2goagent+command earlier during session creation... ----------------------------------------------------------------------- Summary of changes: x2go/backends/terminal/_stdout.py | 3 +-- x2go/session.py | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) The diff of changes is: diff --git a/x2go/backends/terminal/_stdout.py b/x2go/backends/terminal/_stdout.py index f7bea1d..918898a 100644 --- a/x2go/backends/terminal/_stdout.py +++ b/x2go/backends/terminal/_stdout.py @@ -750,7 +750,6 @@ class X2goTerminalSessionSTDOUT(object): # do not run command when in DESKTOP SHARING mode... return None - self.params.update({'cmd': cmd}) # do not allow the execution of full path names @@ -765,7 +764,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", + "&> /dev/null & exit", ] if self.params.snd_system == 'pulse': diff --git a/x2go/session.py b/x2go/session.py index 90b4f83..6b40872 100644 --- a/x2go/session.py +++ b/x2go/session.py @@ -1025,6 +1025,9 @@ class X2goSession(object): if self.has_terminal_session() and not self.faulty: + # only run the session startup command if we do not resume... + if _new_session: + self.terminal_session.run_command(env=self.session_environment) if self._SUPPORTED_SOUND and self.terminal_session.params.snd_system is not 'none': self.terminal_session and not self.faulty and self.terminal_session.start_sound() @@ -1061,9 +1064,6 @@ class X2goSession(object): for _folder in self.share_local_folders: self.share_local_folder(_folder) - # only run the session startup command if we do not resume... - if _new_session: - self.terminal_session.run_command(env=self.session_environment) self.virgin = False self.suspended = False 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).