This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository python-x2go. from d8b6737 x2go/defaults.py: Support LXQt sessions by default. new 7cae4ec x2go/session.py: Only release locks if actually locked. new bd2d333 x2go/session.py: Drop duplicated method is_locked(). The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 2 ++ x2go/session.py | 43 ++++++++++++++++++------------------------- 2 files changed, 20 insertions(+), 25 deletions(-) -- Alioth's /srv/git/code.x2go.org/python-x2go.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 bd2d333b090368fcff64910b563b27d166ecacb5 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Thu Aug 31 15:22:28 2017 +0200 x2go/session.py: Drop duplicated method is_locked(). --- debian/changelog | 1 + x2go/session.py | 16 ---------------- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/debian/changelog b/debian/changelog index eb56494..3bf0232 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ python-x2go (0.5.0.6-0x2go1) UNRELEASED; urgency=medium [ Mike Gabriel ] * x2go/defaults.py: Support LXQt sessions by default. * x2go/session.py: Only release locks if actually locked. + * x2go/session.py: Drop duplicated method is_locked(). -- X2Go Release Manager <git-admin@x2go.org> Mon, 15 May 2017 20:01:59 +0200 diff --git a/x2go/session.py b/x2go/session.py index f36ceea..0500470 100644 --- a/x2go/session.py +++ b/x2go/session.py @@ -269,8 +269,6 @@ class X2GoSession(object): self._last_status = None - self.locked = False - self.auto_start_or_resume = auto_start_or_resume self.auto_connect = auto_connect self.printing = printing @@ -2868,20 +2866,6 @@ class X2GoSession(object): return [ unicode(sf) for sf in self.shared_folders if self.shared_folders[sf]['status'] in ('new', 'mounted') ] __get_shared_folders = get_shared_folders - def is_locked(self): - """\ - Query session if it is locked by some command being processed. - - @return: returns C{True} is the session is locked, C{False} if not; returns C{None}, if there is no - control session yet. - @rtype: C{bool} - - """ - if self.control_session is not None: - return self.control_session.locked or self.locked - return None - __is_locked = is_locked - def session_cleanup(self): """\ Clean up X2Go session. -- Alioth's /srv/git/code.x2go.org/python-x2go.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 7cae4ec3a99448c37644dbfa28cb7931a484531d Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Thu Aug 31 15:21:52 2017 +0200 x2go/session.py: Only release locks if actually locked. --- debian/changelog | 1 + x2go/session.py | 27 ++++++++++++++++++--------- 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3951991..eb56494 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ python-x2go (0.5.0.6-0x2go1) UNRELEASED; urgency=medium [ Mike Gabriel ] * x2go/defaults.py: Support LXQt sessions by default. + * x2go/session.py: Only release locks if actually locked. -- X2Go Release Manager <git-admin@x2go.org> Mon, 15 May 2017 20:01:59 +0200 diff --git a/x2go/session.py b/x2go/session.py index b1f836d..f36ceea 100644 --- a/x2go/session.py +++ b/x2go/session.py @@ -1790,10 +1790,12 @@ class X2GoSession(object): try: _retval = self._resume(session_name=session_name, session_list=session_list, cmd=cmd, progress_event=progress_event) except: - self._lock.release() + if self._lock.locked(): + self._lock.release() raise finally: - self._lock.release() + if self._lock.locked(): + self._lock.release() return _retval def _resume(self, session_name=None, session_list=None, cmd=None, progress_event=None): @@ -1869,7 +1871,8 @@ class X2GoSession(object): self._progress_status = 10 progress_event.set() - self._lock.release() + if self._lock.locked(): + self._lock.release() gevent.sleep(5) self._lock.acquire() @@ -2098,10 +2101,12 @@ class X2GoSession(object): try: _retval = self._share_desktop(desktop=desktop, user=user, display=display, share_mode=share_mode, check_desktop_list=check_desktop_list, progress_event=progress_event) except: - self._lock.release() + if self._lock.locked(): + self._lock.release() raise finally: - self._lock.release() + if self._lock.locked(): + self._lock.release() return _retval def _share_desktop(self, desktop=None, user=None, display=None, share_mode=0, check_desktop_list=True, progress_event=None): @@ -2298,10 +2303,12 @@ class X2GoSession(object): try: _retval = self._suspend() except: - self._lock.release() + if self._lock.locked(): + self._lock.release() raise finally: - self._lock.release() + if self._lock.locked(): + self._lock.release() return _retval def _suspend(self): @@ -2369,10 +2376,12 @@ class X2GoSession(object): try: _retval = self._terminate() except: - self._lock.release() + if self._lock.locked(): + self._lock.release() raise finally: - self._lock.release() + if self._lock.locked(): + self._lock.release() return _retval def _terminate(self): -- Alioth's /srv/git/code.x2go.org/python-x2go.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/python-x2go.git
-
git-admin＠x2go.org