The branch, master has been updated via 1bd0f3c07897bc7dcf465efc606980f49ef00262 (commit) via c2ffbe650ab30214ab5a5c23ab29001426202cc9 (commit) from f8455f9b7ae5a8587cb6d654dbaf6ff6f1c3effa (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 1bd0f3c07897bc7dcf465efc606980f49ef00262 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sat Apr 14 00:58:57 2012 +0200 Transform blanks in mount points into underscores. commit c2ffbe650ab30214ab5a5c23ab29001426202cc9 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sat Apr 14 00:57:35 2012 +0200 Fix automatic mounting of Windows-stylish shared local folders. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ x2go/session.py | 2 ++ x2go/utils.py | 4 ++-- 3 files changed, 6 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 29a7da3..d9c3b6e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -88,6 +88,8 @@ python-x2go (0.1.2.0-0~x2go1) UNRELEASED; urgency=low - Fix X2goSession.get_shared_folders() method on Windows. - No list_sessions() calls on server when querying the status of an X2goSession instance. + - Fix automatic mounting of Windows-stylish shared local folders. + - Transform blanks in mount points into underscores. * Depend on python-xlib. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Sat, 28 Sep 2012 01:44:21 +0100 diff --git a/x2go/session.py b/x2go/session.py index 130c4da..0201d1a 100644 --- a/x2go/session.py +++ b/x2go/session.py @@ -1982,12 +1982,14 @@ class X2goSession(object): if _X2GOCLIENT_OS == 'Windows': _driveletter, _path = os.path.splitdrive(shared_folder) _mount_point = '_windrive_%s%s' % (_driveletter[0], _path.replace('\\', '_')) + _mount_point = _mount_point.replace(' ', '_') if mount.lower().endswith(_mount_point.lower()): _found = True break else: _mount_point = shared_folder.replace('/', '_') + _mount_point = _mount_point.replace(' ', '_') if mount.endswith(_mount_point): _found = True break diff --git a/x2go/utils.py b/x2go/utils.py index ce95cad..83a9f76 100644 --- a/x2go/utils.py +++ b/x2go/utils.py @@ -225,8 +225,8 @@ def _convert_SessionProfileOptions_2_SessionParams(_options): for _shared_folder in _export_list: # fix for wrong export field usage in PyHoca-GUI/CLI and python-x2go before 20110923 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]) + if _shared_folder.split(":")[-1] == "1": + _params['share_local_folders'].append(":".join(_shared_folder.split(":")[:-1])) 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).