[X2go-Commits] python-x2go.git - master (branch) updated: 0.1.1.4-45-g57b55fd

X2go dev team git-admin at x2go.org
Sat Sep 24 01:08:21 CEST 2011


The branch, master has been updated
       via  57b55fd657ce06af490bcb15eeff0911c93aec6f (commit)
       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 -----------------------------------------------------------------
commit 57b55fd657ce06af490bcb15eeff0911c93aec6f
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat Sep 24 01:08:17 2011 +0200

    minor method name extension in X2goClient class, indent fix

commit d74935d3e533b5a6708f77f6028c13d353e2eba4
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat Sep 24 01:07:45 2011 +0200

    fix for new/compat export field interpretation

-----------------------------------------------------------------------

Summary of changes:
 x2go/client.py |    8 +++++---
 x2go/utils.py  |    9 ++++-----
 2 files changed, 9 insertions(+), 8 deletions(-)

The diff of changes is:
diff --git a/x2go/client.py b/x2go/client.py
index 8b62d8f..a06e02f 100644
--- a/x2go/client.py
+++ b/x2go/client.py
@@ -1470,7 +1470,7 @@ class X2goClient(object):
             return session_name not in [ s for s in self.server_running_sessions(session_uuid)  + self.server_suspended_sessions(session_uuid) ]
     __has_session_terminated = has_session_terminated
 
-    def share_local_folder_with_session(self, session_uuid=None, local_path=None, profile_name=None, folder_name=None):
+    def share_local_folder(self, session_uuid=None, local_path=None, profile_name=None, folder_name=None):
         """\
         Share a local folder with the X2go session registered as C{session_uuid}.
 
@@ -1504,7 +1504,9 @@ class X2goClient(object):
         else:
             self.logger('Cannot find a terminal session for profile ,,%s\'\' to share a local folder with' % profile_name, loglevel=log.loglevel_WARN)
             return False
-    __share_local_folder_with_session = share_local_folder_with_session
+    __share_local_folder = share_local_folder
+    __share_local_folder_with_session = share_local_folder
+    __share_local_folder_with_profile = share_local_folder
 
     def unshare_all_local_folders(self, session_uuid=None, profile_name=None):
         """\
@@ -1590,7 +1592,7 @@ class X2goClient(object):
             if len(_associated) > 0:
                 session_uuid = _associated[0]
         if session_uuid:
-                return self.session_registry(session_uuid).get_shared_folders()
+            return self.session_registry(session_uuid).get_shared_folders()
     session_get_shared_folders = get_shared_folders
     profile_get_shared_folders = get_shared_folders
     __session_get_shared_folders = get_shared_folders
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