The branch, master has been updated via 085f0382ddfa1d3376c1de9c2d1ec9fcf158c9b9 (commit) via 1301b38eaa34c4bb6aa5a9adb8fe3a5fa7fe69e0 (commit) via ccbc9a1283d4bb9bd6777b9e882374981de200ce (commit) from 47c2a3e5f824fd97e9751e397237cb79db7a5912 (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 085f0382ddfa1d3376c1de9c2d1ec9fcf158c9b9 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Thu Jul 28 15:23:14 2011 +0200 fix for Makefile.docupload commit 1301b38eaa34c4bb6aa5a9adb8fe3a5fa7fe69e0 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Thu Jul 28 15:23:01 2011 +0200 changelog update commit ccbc9a1283d4bb9bd6777b9e882374981de200ce Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Thu Jul 28 15:22:35 2011 +0200 Fix for X2goSessionRegistry.forget method, do not complain if session_uuid is already forgotten. ----------------------------------------------------------------------- Summary of changes: Makefile.docupload | 6 +++--- debian/changelog | 2 ++ x2go/registry.py | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) The diff of changes is: diff --git a/Makefile.docupload b/Makefile.docupload index e12c160..3963db4 100644 --- a/Makefile.docupload +++ b/Makefile.docupload @@ -1,10 +1,10 @@ #!/usr/bin/make -f -# Makefile.pre-debuild file - for python-x2go +# Makefile.docupload file - for python-x2go # Copyright 2010-2011 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de>, GPLv3 applies to this file VERSION=`head -n1 debian/changelog | sed 's,.*(\(.*\)).*,\1,' | cut -d"-" -f1` -DOC_HOST=packages.x2go.org -DOC_PATH=/srv/sites/x2go.org/packages/doc/python-x2go +DOC_HOST=code.x2go.org +DOC_PATH=/srv/sites/x2go.org/code/doc/python-x2go DOC_USER=x2go-admin doc: docbuild docupload diff --git a/debian/changelog b/debian/changelog index c112782..5e010e5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,8 @@ python-x2go (0.1.1.5-0~x2go1) unstable; urgency=low * New upstream version (0.1.1.5), bugfix release for 0.1.1.x series: - Call hook method instead of exception raisal if session startup has failed. - Handle full path command string appropriately. + - Fix for X2goSessionRegistry.forget method, do not complain if session_uuid + is already forgotten. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Tue, 19 Jul 2011 20:44:30 +0200 diff --git a/x2go/registry.py b/x2go/registry.py index 46cf87c..3e855cd 100644 --- a/x2go/registry.py +++ b/x2go/registry.py @@ -143,7 +143,7 @@ class X2goSessionRegistry(object): try: del self.registry[session_uuid] self.logger('Forgetting session UUID %s' % session_uuid, loglevel=log.loglevel_DEBUG) - except IndexError: + except KeyError: pass def get_profile_id(self, session_uuid): 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).