x2go-commits August 2013

x2go-commits@lists.x2go.org

2 participants
2119 discussions

python-x2go.git - master (branch) updated: 0.4.0.7-8-ged9005d
by git-admin＠x2go.org 07 Aug '13

07 Aug '13

The branch, master has been updated via ed9005dad8ef2de3c820aa82d9e61887ddb64b54 (commit) from 000e5e38e26713f485314365486d05b93100a189 (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 ed9005dad8ef2de3c820aa82d9e61887ddb64b54 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Aug 7 12:18:57 2013 +0200 Continue development... ----------------------------------------------------------------------- Summary of changes: debian/changelog | 6 ++++++ x2go/__init__.py | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 0d44145..0993fda 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +python-x2go (0.4.0.9-0~x2go1) UNRELEASED; urgency=low + + * Continue development... + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 07 Aug 2013 12:18:46 +0200 + python-x2go (0.4.0.8-0~x2go1) unstable; urgency=low * New upstream version (0.4.0.8): diff --git a/x2go/__init__.py b/x2go/__init__.py index 0c40bef..65bd8c7 100644 --- a/x2go/__init__.py +++ b/x2go/__init__.py @@ -183,7 +183,7 @@ Contact """ __NAME__ = 'python-x2go' -__VERSION__ = '0.4.0.8' +__VERSION__ = '0.4.0.9' from gevent import monkey monkey.patch_all() 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).

1 0

python-x2go.git - build-baikal (branch) updated: 0.4.0.7-4-gb435cdc
by git-admin＠x2go.org 07 Aug '13

07 Aug '13

The branch, build-baikal has been updated via b435cdc1d7980d8dec33f1e05cb3947ecf08dd07 (commit) from 81c41bdee16b575584f158c4a27893adfeb371c4 (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 | 2 ++ x2go/registry.py | 3 +++ x2go/session.py | 13 +++++++++++++ 3 files changed, 18 insertions(+) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 9f930ea..8f78fb2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ python-x2go (0.4.0.8-0~x2go1) UNRELEASED; urgency=low * New upstream version (0.4.0.8): - Fix session profile updates with changes to the host parameter. + - Use the session object's lock to detect if updating the session + status in the session registry is something appropriate to do. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sat, 03 Aug 2013 22:32:30 +0200 diff --git a/x2go/registry.py b/x2go/registry.py index 2bd2d14..0b46661 100644 --- a/x2go/registry.py +++ b/x2go/registry.py @@ -271,6 +271,9 @@ class X2GoSessionRegistry(object): if type(self(_session_uuid)) != session.X2GoSession: continue + if self(_session_uuid).is_locked(): + continue + if not self(_session_uuid).update_status(session_list=session_list, force_update=force_update): # skip this run, as nothing has changed since the last time... continue diff --git a/x2go/session.py b/x2go/session.py index 6302363..237e84b 100644 --- a/x2go/session.py +++ b/x2go/session.py @@ -1799,7 +1799,9 @@ class X2GoSession(object): self._progress_status = 10 progress_event.set() + self._lock.release() gevent.sleep(5) + self._lock.acquire() self._progress_status = 15 progress_event.set() @@ -2754,3 +2756,14 @@ class X2GoSession(object): self.terminal_session = None __session_cleanup = session_cleanup + def is_locked(self): + """\ + Test if the session is lock at the moment. This normally occurs + if there is some action running that will result in a session status + change. + + @return: returns C{True} if the session is locked + @rtype: C{bool} + + """ + self._lock.locked() 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).

1 0

python-x2go.git - build-baikal (branch) updated: 0.4.0.7-2-g60eebc8
by git-admin＠x2go.org 07 Aug '13

07 Aug '13

The branch, build-baikal has been updated via 60eebc868465959b63f36c49f54ce73b00cce1e2 (commit) from 0c579d265133d482eae4e9a20928965ed3e177b8 (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 | 3 ++- x2go/backends/profiles/_file.py | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 5c32913..9f930ea 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ python-x2go (0.4.0.8-0~x2go1) UNRELEASED; urgency=low - * Continue development... + * New upstream version (0.4.0.8): + - Fix session profile updates with changes to the host parameter. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sat, 03 Aug 2013 22:32:30 +0200 diff --git a/x2go/backends/profiles/_file.py b/x2go/backends/profiles/_file.py index 0b9eedb..31a11f3 100644 --- a/x2go/backends/profiles/_file.py +++ b/x2go/backends/profiles/_file.py @@ -346,7 +346,7 @@ class X2GoSessionProfilesFILE(inifiles.X2GoIniFile): else: return '' - def add_profile(self, profile_id=None, **kwargs): + def add_profile(self, profile_id=None, force_add=False, **kwargs): """\ Add a new session profile. @@ -365,7 +365,7 @@ class X2GoSessionProfilesFILE(inifiles.X2GoIniFile): if 'name' not in kwargs.keys(): raise X2GoProfileException('session profile parameter ,,name\'\' is missing in method parameters') - if kwargs['name'] in self.profile_names: + if kwargs['name'] in self.profile_names and not force_add: raise X2GoProfileException('a profile of name ,,%s\'\' already exists' % kwargs['name']) for key, value in kwargs.items(): 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).

1 0

python-x2go.git - build-baikal (branch) updated: 0.4.0.7-5-g436a770
by git-admin＠x2go.org 07 Aug '13

07 Aug '13

The branch, build-baikal has been updated via 436a770160211b9c89abe24a27ceb7ec8b79dc7b (commit) from b435cdc1d7980d8dec33f1e05cb3947ecf08dd07 (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 | 2 ++ x2go/session.py | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 8f78fb2..5417219 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ python-x2go (0.4.0.8-0~x2go1) UNRELEASED; urgency=low - Fix session profile updates with changes to the host parameter. - Use the session object's lock to detect if updating the session status in the session registry is something appropriate to do. + - Do not overwrite not-yet-suspended terminal session objects during + session resumption. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sat, 03 Aug 2013 22:32:30 +0200 diff --git a/x2go/session.py b/x2go/session.py index 237e84b..065e85f 100644 --- a/x2go/session.py +++ b/x2go/session.py @@ -1759,7 +1759,8 @@ class X2GoSession(object): @raise Exception: any exception that occurs during published application menu retrieval is passed through """ - self.terminal_session = 'PENDING' + if self.terminal_session is None: + self.terminal_session = 'PENDING' # initialize a dummy event to avoid many if clauses further down in the code self.reset_progress_status() @@ -1795,6 +1796,7 @@ class X2GoSession(object): try: self._suspend() + self.terminal_session = 'PENDING' self._progress_status = 10 progress_event.set() 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).

1 0

python-x2go.git - build-baikal (branch) updated: 0.4.0.7-7-g000e5e3
by git-admin＠x2go.org 07 Aug '13

07 Aug '13

The branch, build-baikal has been updated via 000e5e38e26713f485314365486d05b93100a189 (commit) from 486fa4f1d591502b3311630f6ba8ab44e1c70918 (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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index c21b5c6..0d44145 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -python-x2go (0.4.0.8-0~x2go1) UNRELEASED; urgency=low +python-x2go (0.4.0.8-0~x2go1) unstable; urgency=low * New upstream version (0.4.0.8): - Fix session profile updates with changes to the host parameter. @@ -8,7 +8,7 @@ python-x2go (0.4.0.8-0~x2go1) UNRELEASED; urgency=low session resumption. - Remove shbang from x2go/tests/runalltests.py, as well. - -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sat, 03 Aug 2013 22:32:30 +0200 + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 07 Aug 2013 12:17:27 +0200 python-x2go (0.4.0.7-0~x2go1) unstable; urgency=low 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).

1 0

python-x2go.git - build-baikal (branch) updated: 0.4.0.7-3-g81c41bd
by git-admin＠x2go.org 07 Aug '13

07 Aug '13

The branch, build-baikal has been updated via 81c41bdee16b575584f158c4a27893adfeb371c4 (commit) from 60eebc868465959b63f36c49f54ce73b00cce1e2 (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: x2go/backends/profiles/_file.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/x2go/backends/profiles/_file.py b/x2go/backends/profiles/_file.py index 31a11f3..ac0c380 100644 --- a/x2go/backends/profiles/_file.py +++ b/x2go/backends/profiles/_file.py @@ -154,7 +154,7 @@ class X2GoSessionProfilesFILE(inifiles.X2GoIniFile): self.iniConfig.remove_section(profile_id) try: self._cached_profile_ids.remove(profile_id) except ValueError: pass - self.add_profile(profile_id=None, **_config) + self.add_profile(profile_id=None, force_add=True, **_config) self._profiles_need_profile_id_renewal = [] self._cached_profile_ids = [] self._cached_profile_names = [] 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).

1 0

python-x2go.git - build-baikal (branch) updated: 0.4.0.7-6-g486fa4f
by git-admin＠x2go.org 07 Aug '13

07 Aug '13

The branch, build-baikal has been updated via 486fa4f1d591502b3311630f6ba8ab44e1c70918 (commit) from 436a770160211b9c89abe24a27ceb7ec8b79dc7b (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 | 1 + x2go/tests/runalltests.py | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 5417219..c21b5c6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ python-x2go (0.4.0.8-0~x2go1) UNRELEASED; urgency=low status in the session registry is something appropriate to do. - Do not overwrite not-yet-suspended terminal session objects during session resumption. + - Remove shbang from x2go/tests/runalltests.py, as well. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sat, 03 Aug 2013 22:32:30 +0200 diff --git a/x2go/tests/runalltests.py b/x2go/tests/runalltests.py index a4320b8..60e3a28 100644 --- a/x2go/tests/runalltests.py +++ b/x2go/tests/runalltests.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python # -*- coding: utf-8 -*- # Copyright (C) 2010 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> 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).

1 0

python-x2go.git - build-baikal (branch) updated: 0.4.0.7-1-g0c579d2
by git-admin＠x2go.org 07 Aug '13

07 Aug '13

The branch, build-baikal has been updated via 0c579d265133d482eae4e9a20928965ed3e177b8 (commit) from 669b839fac15271e83040650d6aa4352563ed41a (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 | 6 ++++++ x2go/__init__.py | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 108ff7a..5c32913 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +python-x2go (0.4.0.8-0~x2go1) UNRELEASED; urgency=low + + * Continue development... + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sat, 03 Aug 2013 22:32:30 +0200 + python-x2go (0.4.0.7-0~x2go1) unstable; urgency=low [ Mike Gabriel ] diff --git a/x2go/__init__.py b/x2go/__init__.py index 84059cd..0c40bef 100644 --- a/x2go/__init__.py +++ b/x2go/__init__.py @@ -183,7 +183,7 @@ Contact """ __NAME__ = 'python-x2go' -__VERSION__ = '0.4.0.7' +__VERSION__ = '0.4.0.8' from gevent import monkey monkey.patch_all() 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).

1 0

python-x2go.git - build-main (branch) updated: 0.4.0.7-5-g436a770
by git-admin＠x2go.org 07 Aug '13

07 Aug '13

The branch, build-main has been updated via 436a770160211b9c89abe24a27ceb7ec8b79dc7b (commit) from b435cdc1d7980d8dec33f1e05cb3947ecf08dd07 (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 | 2 ++ x2go/session.py | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 8f78fb2..5417219 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ python-x2go (0.4.0.8-0~x2go1) UNRELEASED; urgency=low - Fix session profile updates with changes to the host parameter. - Use the session object's lock to detect if updating the session status in the session registry is something appropriate to do. + - Do not overwrite not-yet-suspended terminal session objects during + session resumption. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sat, 03 Aug 2013 22:32:30 +0200 diff --git a/x2go/session.py b/x2go/session.py index 237e84b..065e85f 100644 --- a/x2go/session.py +++ b/x2go/session.py @@ -1759,7 +1759,8 @@ class X2GoSession(object): @raise Exception: any exception that occurs during published application menu retrieval is passed through """ - self.terminal_session = 'PENDING' + if self.terminal_session is None: + self.terminal_session = 'PENDING' # initialize a dummy event to avoid many if clauses further down in the code self.reset_progress_status() @@ -1795,6 +1796,7 @@ class X2GoSession(object): try: self._suspend() + self.terminal_session = 'PENDING' self._progress_status = 10 progress_event.set() 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).

1 0

python-x2go.git - build-main (branch) updated: 0.4.0.7-7-g000e5e3
by git-admin＠x2go.org 07 Aug '13

07 Aug '13

The branch, build-main has been updated via 000e5e38e26713f485314365486d05b93100a189 (commit) from 486fa4f1d591502b3311630f6ba8ab44e1c70918 (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 000e5e38e26713f485314365486d05b93100a189 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Aug 7 12:17:44 2013 +0200 release 0.4.0.8 ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index c21b5c6..0d44145 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -python-x2go (0.4.0.8-0~x2go1) UNRELEASED; urgency=low +python-x2go (0.4.0.8-0~x2go1) unstable; urgency=low * New upstream version (0.4.0.8): - Fix session profile updates with changes to the host parameter. @@ -8,7 +8,7 @@ python-x2go (0.4.0.8-0~x2go1) UNRELEASED; urgency=low session resumption. - Remove shbang from x2go/tests/runalltests.py, as well. - -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sat, 03 Aug 2013 22:32:30 +0200 + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 07 Aug 2013 12:17:27 +0200 python-x2go (0.4.0.7-0~x2go1) unstable; urgency=low 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).

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits August 2013