The branch, twofactorauth has been updated via 393c1297895e723167977505e45df18e4f903b5a (commit) from 4982c1319f128dd81cd5da71ecbcf7d73312e3e6 (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 | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index d7e7c8c..1042ea1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -104,6 +104,8 @@ python-x2go (0.1.2.0-0~x2go1) UNRELEASED; urgency=low - Use VcXsrv-1.12.0.1 when testing Python X2Go applications. - If configured X-server display port is already in use, try to detect the next available display number. + - Make transitions of master sessions more robust. Only allow local folder sharing for + running sessions. * Depend on python-xlib. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Sat, 28 Sep 2012 01:44:21 +0100 diff --git a/x2go/session.py b/x2go/session.py index 0201d1a..d3d7d9e 100644 --- a/x2go/session.py +++ b/x2go/session.py @@ -488,8 +488,7 @@ class X2goSession(object): """ self.logger('Using session %s as master session for profile %s.' % (self.get_session_name(), self.get_profile_name()), loglevel=log.loglevel_NOTICE) self.master_session = True - if self.has_terminal_session(): - self.share_all_local_folders() + self.share_all_local_folders() def unset_master_session(self): """\ @@ -1494,7 +1493,6 @@ class X2goSession(object): self.HOOK_mimebox_not_available() self._SUPPORTED_MIMEBOX = False - self.share_all_local_folders() self.virgin = False self.suspended = False @@ -1502,6 +1500,8 @@ class X2goSession(object): self.terminated = False self.faulty = False + self.share_all_local_folders() + self.has_terminal_session() and self.terminal_session.session_info_unprotect() return True @@ -1890,7 +1890,7 @@ class X2goSession(object): """ _retval = False - if self.has_terminal_session() and self.share_local_folders and not self.faulty: + if self.has_terminal_session() and self.share_local_folders and not self.faulty and self.is_running(): if self._SUPPORTED_FOLDERSHARING and self.is_folder_sharing_available(): if self.control_session.get_transport().reverse_tunnels[self.terminal_session.get_session_name()]['sshfs'][1] is not None: _retval = True 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).