[X2Go-Commits] python-x2go.git - master (branch) updated: 0.4.0.3-8-g4ef900d

[X2Go dev team]

The branch, master has been updated
       via  4ef900de0380f23eabf121d7182178f6b05e3838 (commit)
      from  f1dc23233c1f0b9df67844a8245744e71c00b472 (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 4ef900de0380f23eabf121d7182178f6b05e3838
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed May 29 00:19:15 2013 +0200

    Support mounting client-side folders on UNC paths.

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

Summary of changes:
 debian/changelog                  |    1 +
 x2go/backends/terminal/_stdout.py |   14 +++++++++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 4e98b34..ebea3ab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ python-x2go (0.4.0.4-0~x2go1) UNRELEASED; urgency=low
       monkey patching those methods that got fixed in 1.11.0.
     - Ignore KeyError exceptions in session cache for suddenly removed cache items.
       Silence/fix some race conditions on connection failures.
+    - Support mounting client-side folders on UNC paths.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Sun, 21 Apr 2013 23:21:29 +0200
 
diff --git a/x2go/backends/terminal/_stdout.py b/x2go/backends/terminal/_stdout.py
index aeead53..b1a3f28 100644
--- a/x2go/backends/terminal/_stdout.py
+++ b/x2go/backends/terminal/_stdout.py
@@ -840,9 +840,17 @@ class X2GoTerminalSessionSTDOUT(object):
             _server_encoding = self.params.server_encoding
 
             if _X2GOCLIENT_OS == 'Windows':
-                local_path = local_path.replace('\\', '/')
-                local_path = local_path.replace(':', '')
-                local_path = '/windrive/%s' % local_path
+                if local_path.startswith('\\\\'):
+                    # we are on a UNC path
+                    if 'X2GO_MOUNT_UNCPATHS' in self.control_session.get_server_features():
+                        local_path = local_path.repalce('\\\\', '/uncpath/')
+                    else:
+                        local_path = local_path.repalce('\\\\', '/windrive/')
+                    local_path = local_path.replace('\\', '/')
+                else:
+                    local_path = local_path.replace('\\', '/')
+                    local_path = local_path.replace(':', '')
+                    local_path = '/windrive/%s' % local_path
                 _convert_encoding = True
                 _client_encoding = 'WINDOWS-1252'
 


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