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

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


The branch, twofactorauth has been updated
       via  d74935d3e533b5a6708f77f6028c13d353e2eba4 (commit)
      from  36567492b6138852f9b1f578f11d0fdf47b441f9 (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/utils.py |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

The diff of changes is:
diff --git a/x2go/utils.py b/x2go/utils.py
index 3015a9f..cbc607b 100644
--- a/x2go/utils.py
+++ b/x2go/utils.py
@@ -207,19 +207,18 @@ def _convert_SessionProfileOptions_2_SessionParams(_options):
 
         _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 = _export.strip().strip('"').strip().strip(';').strip()
         _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":
+            if not ":" in _shared_folder: _shared_folder = "%s:1" % _shared_folder
+            if _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