[X2Go-Commits] python-x2go.git - twofactorauth (branch) updated: 0.1.1.4-48-g4d3232c

X2Go dev team git-admin at x2go.org
Sat Sep 14 15:57:05 CEST 2013


The branch, twofactorauth has been updated
       via  4d3232c3b5fd7cff1c178035de801b37846fffbd (commit)
      from  17a51ab4b2ab1f1237d4fe0e9ccd5aa9d98235c3 (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/session.py |   15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

The diff of changes is:
diff --git a/x2go/session.py b/x2go/session.py
index e9baf78..5814748 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.share_local_folders and self.terminal_session and not self.faulty and self.is_folder_sharing_available():
+                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 _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)
@@ -1396,8 +1396,11 @@ class X2goSession(object):
         @rtype: C{bool}
 
         """
-        if self.is_connected():
-            return self.control_session.is_folder_sharing_available()
+        if self._SUPPORTED_FOLDERSHARING and self.allow_share_local_folders:
+            if self.is_connected():
+                return self.control_session.is_folder_sharing_available()
+        else:
+            self.logger('local folder sharing is disabled for this session profile', loglevel=log.loglevel_WARN)
 
     def share_local_folder(self, local_path=None, folder_name=None):
         """\
@@ -1418,7 +1421,7 @@ class X2goSession(object):
         if folder_name: local_path=folder_name
 
         if self.has_terminal_session():
-            if self.allow_share_local_folders:
+            if self._SUPPORTED_FOLDERSHARING and self.allow_share_local_folders:
                 if self.terminal_session.share_local_folder(local_path=local_path):
                     self.shared_folders.append(local_path)
                     return True
@@ -1443,7 +1446,7 @@ class X2goSession(object):
 
         """
         if self.has_terminal_session():
-            if self.allow_share_local_folders:
+            if self._SUPPORTED_FOLDERSHARING and self.allow_share_local_folders:
                 if force_all:
                     self.shared_folders = []
                     return self.terminal_session.unshare_all_local_folders()
@@ -1474,7 +1477,7 @@ class X2goSession(object):
 
         """
         if self.has_terminal_session():
-            if self.allow_share_local_folders and local_path in self.shared_folders:
+            if self._SUPPORTED_FOLDERSHARING and self.allow_share_local_folders and local_path in self.shared_folders:
                 self.shared_folders.remove(local_path)
                 return self.terminal_session.unshare_local_folder(local_path=local_path)
             else:


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).




More information about the x2go-commits mailing list