[X2go-Commits] python-x2go.git - release/0.1.1.x (branch) updated: 0.1.1.4-13-g65bc840

[X2go dev team]

The branch, release/0.1.1.x has been updated
       via  65bc84008ddf63ac5d464ccb0f74109eb22d8b84 (commit)
       via  68e33528fd928c7067a18ff0b485cbf0891ec8c5 (commit)
       via  7e65631076b0ba6f57462b000394847d04bcbc0c (commit)
      from  e68649f2131e414916354a043b2e2280b3288790 (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 65bc84008ddf63ac5d464ccb0f74109eb22d8b84
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Jul 28 15:23:01 2011 +0200

    changelog update

commit 68e33528fd928c7067a18ff0b485cbf0891ec8c5
Author: Mike Gabriel <mike.gabriel at 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.

commit 7e65631076b0ba6f57462b000394847d04bcbc0c
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Jul 28 15:23:14 2011 +0200

    fix for Makefile.docupload

-----------------------------------------------------------------------

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 at 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 b09e257..598ebb5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ python-x2go (0.1.1.5-0~x2go1) UNRELEASED; 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 at das-netzwerkteam.de>  Tue, 19 Jul 2011 20:44:30 +0200
 
diff --git a/x2go/registry.py b/x2go/registry.py
index 304aa97..7581e09 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).