[X2Go-Commits] python-x2go.git - brokerclient (branch) updated: 0.1.1.4-43-g3656749

X2Go dev team git-admin at x2go.org
Tue Jan 7 16:20:52 CET 2014


The branch, brokerclient has been updated
       via  36567492b6138852f9b1f578f11d0fdf47b441f9 (commit)
      from  b5501a1447d7b60b29f0b8ab3009e8d9f7f60667 (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/utils.py    |   20 +++++++++++++++++---
 2 files changed, 19 insertions(+), 3 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 6d6ce32..81dffb3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,8 @@ python-x2go (0.1.1.7-0-x2go1) UNRELEASED; urgency=low
     - Use TCP_NODELAY socket option for graphics forwarding tunnels.
     - Typo fixes in session.py, related to calling _X2goSession__disconnect
       method.
+    - Compatibility fix for X2go folder sharing (session profile attribute:
+      export).
 
   [ Dick Kniep ]
   * Fix for upstream version 0.1.1.7:
diff --git a/x2go/utils.py b/x2go/utils.py
index e070557..3015a9f 100644
--- a/x2go/utils.py
+++ b/x2go/utils.py
@@ -144,7 +144,6 @@ def _convert_SessionProfileOptions_2_SessionParams(_options):
             'speed': 'link',
             'sshport': 'port',
             'useexports': 'allow_share_local_folders',
-            'export': 'share_local_folders',
             'usemimebox': 'allow_mimebox',
             'mimeboxextensions': 'mimebox_extensions',
             'mimeboxaction': 'mimebox_action',
@@ -204,8 +203,23 @@ def _convert_SessionProfileOptions_2_SessionParams(_options):
 
     del _params['fstunnel']
 
-    if _params.has_key('share_local_folders'):
-        _params['share_local_folders'] = [ f for f in _params['share_local_folders'].split(',') if f ]
+    if _params.has_key('export'):
+
+        _export = _params['export']
+        del _params['export']
+        _export = _export.replace('"', "")
+
+        # fix for wrong export field usage in PyHoca-GUI/CLI and python-x2go before 20110923
+        _export = _export.replace(",", ";")
+        _export_list = [ f for f in _export.split(';') if f ]
+
+        _params['share_local_folders'] = []
+        for _shared_folder in _export_list:
+            # fix for wrong export field usage in PyHoca-GUI/CLI and python-x2go before 20110923
+            if ":" in _shared_folder and _shared_folder.split(":")[1] == "1":
+                _params['share_local_folders'].append(_shared_folder.split(":")[0])
+            else:
+                _params['share_local_folders'].append(_shared_folder)
 
     if not _options['fullscreen']:
         _params['geometry'] = '%sx%s' % (_options['width'], _options['height'])


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