The branch, build-baikal has been updated via 450da43206df524fd800f452afee38c2ec1e0abc (commit) via d761e7f130018e8a275f87d0316a69c842c739e7 (commit) via 938bb81114832e2c769218b90cd346c4258d59b8 (commit) via 4af31629e0038edcb7c8a89f463d641e50f9e88a (commit) from 752880e6a972e243aae84d0d5f3bb2ca4af04128 (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/changelog | 8 ++++++++ x2go/__init__.py | 2 +- x2go/backends/info/_stdout.py | 14 +++++++------- x2go/backends/profiles/_file.py | 4 ++++ 4 files changed, 20 insertions(+), 8 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 4134734..ef4e0f8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +python-x2go (0.4.0.2-0~x2go1) unstable; urgency=low + + * New upstream version (0.4.0.2): + - Empty session profile name/id cache when adding new profiles. (Fixes: + #130). + + -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Sun, 03 Mar 2013 15:55:57 +0100 + python-x2go (0.4.0.1-0~x2go1) unstable; urgency=low * Documentation fix and typo fix relevant for win32 build. diff --git a/x2go/__init__.py b/x2go/__init__.py index 926a338..17375d6 100644 --- a/x2go/__init__.py +++ b/x2go/__init__.py @@ -183,7 +183,7 @@ Contact """ __NAME__ = 'python-x2go' -__VERSION__ = '0.4.0.1' +__VERSION__ = '0.4.0.2' from gevent import monkey monkey.patch_all() diff --git a/x2go/backends/info/_stdout.py b/x2go/backends/info/_stdout.py index 2273eb3..6bbed1d 100644 --- a/x2go/backends/info/_stdout.py +++ b/x2go/backends/info/_stdout.py @@ -60,20 +60,20 @@ class X2GoServerSessionInfoSTDOUT(object): """ try: l = x2go_output.split("|") - self.name = l[1] - self.cookie = l[6] self.agent_pid = int(l[0]) + self.name = l[1] self.display = int(l[2]) - self.status = l[4] - self.graphics_port = int(l[8]) - self.snd_port = int(l[9]) - self.sshfs_port = int(l[13]) - self.username = l[11] self.hostname = l[3] + self.status = l[4] # TODO: turn into datetime object self.date_created = l[5] + self.cookie = l[6] + self.graphics_port = int(l[8]) + self.snd_port = int(l[9]) # TODO: turn into datetime object self.date_suspended = l[10] + self.username = l[11] + self.sshfs_port = int(l[13]) self.local_container = '' except IndexError, e: # DEBUGGING CODE diff --git a/x2go/backends/profiles/_file.py b/x2go/backends/profiles/_file.py index 64b5f15..b5b05ff 100644 --- a/x2go/backends/profiles/_file.py +++ b/x2go/backends/profiles/_file.py @@ -155,6 +155,7 @@ class X2GoSessionProfilesFILE(inifiles.X2GoIniFile): try: self._cached_profile_ids.remove(profile_id) except ValueError: pass self.add_profile(profile_id=None, **_config) + self._cached_profile_ids = [] self._cached_profile_names = [] self._profiles_need_profile_id_renewal = [] @@ -368,6 +369,9 @@ class X2GoSessionProfilesFILE(inifiles.X2GoIniFile): if key in kwargs: continue self.update_value(None, key, value, profile_id=profile_id) + self._cached_profile_ids = [] + self._cached_profile_names = [] + return profile_id def delete_profile(self, profile_id_or_name): 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).