The branch, twofactorauth has been updated via 4940e7aeb3cec0371e1d282b7818f5e6ce52453b (commit) from 4d3232c3b5fd7cff1c178035de801b37846fffbd (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/terminal/_stdout.py | 9 ++------- x2go/session.py | 2 +- 2 files changed, 3 insertions(+), 8 deletions(-) The diff of changes is: diff --git a/x2go/backends/terminal/_stdout.py b/x2go/backends/terminal/_stdout.py index 0e72e77..6dab394 100644 --- a/x2go/backends/terminal/_stdout.py +++ b/x2go/backends/terminal/_stdout.py @@ -439,17 +439,12 @@ class X2goTerminalSessionSTDOUT(object): # tunnel has already been started and might simply need a resume call self.reverse_tunnels[self.session_info.name]['snd'][1].resume() - def is_folder_sharing_available(self): - if self.session_info.username in self.control_session._x2go_remote_group('fuse'): - return True - return False - def start_sshfs(self): """\ Initialize Paramiko/SSH reverse forwarding tunnel for X2go folder sharing. """ - if self.is_folder_sharing_available(): + if self.control_session.is_folder_sharing_available(): raise x2go_exceptions.X2goUserException('remote user %s is not member of X2go server group fuse' % self.session_info.username) # start reverse SSH tunnel for sshfs (folder sharing, printing) @@ -596,7 +591,7 @@ class X2goTerminalSessionSTDOUT(object): @rtype: bool """ - if self.is_folder_sharing_available(): + if self.control_session.is_folder_sharing_available(): raise x2go_exceptions.X2goUserException('remote user %s is not member of X2go server group fuse' % self.session_info.username) if local_path is None: diff --git a/x2go/session.py b/x2go/session.py index 5814748..aff19c1 100644 --- a/x2go/session.py +++ b/x2go/session.py @@ -1060,7 +1060,7 @@ class X2goSession(object): self.terminal_session and not self.faulty and self.terminal_session.start_mimebox(mimebox_extensions=self.mimebox_extensions, mimebox_action=self.mimebox_action) self.terminal_session and self.session_environment.update({'X2GO_MIMEBOX': self.terminal_session.get_mimebox_spooldir(), }) - if self._SUPPORTED_FOLDERSHARING and self.allow_share_local_folders and self.share_local_folders and self.terminal_session and not self.faulty and self.is_folder_sharing_available(): + if self.share_local_folders and self.terminal_session and not self.faulty and self.is_folder_sharing_available(): if _control.get_transport().reverse_tunnels[self.terminal_session.get_session_name()]['sshfs'][1] is not None: for _folder in self.share_local_folders: self.share_local_folder(_folder) 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).