This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository python-x2go. commit e015a953b57eafa31db3611cb3e1a40354b961a8 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Oct 21 01:06:34 2014 +0200 debian/copyright: Relicense packaging files under same license as upstream files. --- debian/changelog | 2 ++ debian/copyright | 20 +------------------- 2 files changed, 3 insertions(+), 19 deletions(-) diff --git a/debian/changelog b/debian/changelog index ca7c78c..a7be44b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ python-x2go (0.5.0.2-0x2go1) UNRELEASED; urgency=medium - Continue development... * debian/control: + Bump Standards: to 3.9.6. No changes needed. + * debian/copyright: + + Relicense packaging files under same license as upstream files. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Mon, 20 Oct 2014 23:30:04 +0200 diff --git a/debian/copyright b/debian/copyright index adf56c5..eea667c 100644 --- a/debian/copyright +++ b/debian/copyright @@ -40,25 +40,7 @@ License: GPL-3+ Files: debian/* Copyright: 2010-2014, Mike Gabriel <mike.gabriel@das-netzwerkteam.de> -License: GPL-2+ - Python X2Go is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - . - Python X2Go is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - . - You should have received a copy of the GNU General Public License - along with this program; if not, write to the - Free Software Foundation, Inc., - 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. - . - On Debian systems, the full text of the GNU General Public - License version 2 can be found in the file - `/usr/share/common-licenses/GPL-2'. +License: AGPL-3+ License: AGPL-3+ Python X2Go is free software; you can redistribute it and/or modify -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/python-x2go.git

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository python-x2go. commit 6c6c3fa7fb919af0924d91adf10bb4806e3e1a37 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Nov 12 06:16:40 2014 +0100 Catch control session disconnects during session's run_command call. --- debian/changelog | 3 ++- x2go/session.py | 16 ++++++++++++++-- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 02edb6f..f2f8d83 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,8 @@ python-x2go (0.5.0.2-0x2go1) UNRELEASED; urgency=medium * New upstream version (0.5.0.2): - - Continue development... + - Catch control session disconnects during session's + run_command call. * debian/control: + Bump Standards: to 3.9.6. No changes needed. + Mention "client side printing support" in LONG_DESCRIPTION. diff --git a/x2go/session.py b/x2go/session.py index 22760e4..b0e1d84 100644 --- a/x2go/session.py +++ b/x2go/session.py @@ -1994,7 +1994,13 @@ class X2GoSession(object): # only run the session startup command if we do not resume... if _new_session: - self.has_terminal_session() and self.terminal_session.run_command(env=self.session_environment) + try: + self.has_terminal_session() and self.terminal_session.run_command(env=self.session_environment) + except x2go_exceptions.X2GoControlSessionException: + self.logger('%s' % str(e), loglevel=log.loglevel_ERROR) + self.HOOK_on_control_session_death() + self._X2GoSession__disconnect() + return False self.virgin = False self.suspended = False @@ -2189,7 +2195,13 @@ class X2GoSession(object): # shared desktop sessions get their startup command set by the control # session, run this pre-set command now... - self.terminal_session.run_command(env=self.session_environment) + try: + self.terminal_session.run_command(env=self.session_environment) + except x2go_exceptions.X2GoControlSessionException: + self.logger('%s' % str(e), loglevel=log.loglevel_ERROR) + self.HOOK_on_control_session_death() + self._X2GoSession__disconnect() + return False self.virgin = False self.suspended = False -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/python-x2go.git